X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2FCMakeLists.txt;h=9b12f8ff7e8758b3ebb40ce2d4fe503af4dfcba1;hb=efe55c8afe89bd1d090c59513f2be82ad3ab9b0d;hp=08e6f47ecde47e146846089b947d9f4be86c11d7;hpb=e35c619cb84c22854f9e08ffc8634a6cc65f381c;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/CMakeLists.txt b/lib/maracasVisuLib/CMakeLists.txt
index 08e6f47..9b12f8f 100644
--- a/lib/maracasVisuLib/CMakeLists.txt
+++ b/lib/maracasVisuLib/CMakeLists.txt
@@ -1,5 +1,7 @@
 #----------------------------------------------------------------------------
 # SET THE NAME OF YOUR LIBRARY
+
+
 SET ( LIBRARY_NAME   creaMaracasVisu  )
 #----------------------------------------------------------------------------
 
@@ -7,11 +9,11 @@ SET ( LIBRARY_NAME   creaMaracasVisu  )
 # CREATES A USER OPTION IN CMAKE
 OPTION ( BUILD_${LIBRARY_NAME}  "Build ${LIBRARY_NAME} library ?" ON)
 
-#OPTION ( EXPORTS_MaracasKernel  "Build ${LIBRARY_NAME} library ?" ON)
-#IF (EXPORTS_MaracasKernel)
-#	SET(MaracasKernel_EXPORTS)
-#	ADD_DEFINITIONS (-DMaracasKernel_EXPORTS)
-#ENDIF(EXPORTS_MaracasKernel)
+OPTION ( EXPORTS_MaracasKernel  "Build ${LIBRARY_NAME} library ?" ON)
+IF (EXPORTS_MaracasKernel)
+	SET(MaracasKernel_EXPORTS)
+	ADD_DEFINITIONS (-DMaracasKernel_EXPORTS)
+ENDIF(EXPORTS_MaracasKernel)
 
 #----------------------------------------------------------------------------
 IF ( BUILD_${LIBRARY_NAME} )
@@ -32,6 +34,7 @@ IF ( BUILD_${LIBRARY_NAME} )
     src/interface/wxWindows/Contour
     src/interface/wxWindows/widgets
     src/interface/wxWindows/widgets/pPlotter
+	src/interface/wxWindows/widgets/manualContour
 	../../../
 )
 	#message(jhcl\n\n ${crea_LIBRARIES})
@@ -44,62 +47,95 @@ IF ( BUILD_${LIBRARY_NAME} )
   # EITHER LIST ALL .h IN CURRENT DIR USING NEXT LINE:
   #FILE(GLOB ${LIBRARY_NAME}_HEADERS "*.h")
   # OR MANUALLY LIST YOUR HEADERS WITH NEXT COMMAND
+  
+  FILE(GLOB ${LIBRARY_NAME}_HEADERS_WXWIN "src/interface/wxWindows/*.h")
+  FILE(GLOB ${LIBRARY_NAME}_SOURCES_WXWIN src/interface/wxWindows/*.cxx src/interface/wxWindows/*.cpp src/interface/wxWindows/*.cc)
+  
+  FILE(GLOB ${LIBRARY_NAME}_HEADERS_CONTOUR "src/interface/wxWindows/Contour/*.h")
+  FILE(GLOB ${LIBRARY_NAME}_SOURCES_CONTOUR src/interface/wxWindows/Contour/*.cxx src/interface/wxWindows/Contour/*.cpp src/interface/wxWindows/Contour/*.cc)
+  
+  FILE(GLOB ${LIBRARY_NAME}_HEADERS_WIDGETS "src/interface/wxWindows/widgets/*.h")
+  FILE(GLOB ${LIBRARY_NAME}_SOURCES_WIDGETS src/interface/wxWindows/widgets/*.cxx src/interface/wxWindows/widgets/*.cpp src/interface/wxWindows/widgets/*.cc)
+  
+  FILE(GLOB ${LIBRARY_NAME}_HEADERS_PPLOTTER "src/interface/wxWindows/widgets/pPlotter/*.h")
+  FILE(GLOB ${LIBRARY_NAME}_SOURCES_PPLOTTER src/interface/wxWindows/widgets/pPlotter/*.cxx src/interface/wxWindows/widgets/pPlotter/*.cpp src/interface/wxWindows/widgets/pPlotter/*.cc)
+  
+  FILE(GLOB ${LIBRARY_NAME}_HEADERS_MANUAL_CONTOUR "src/interface/wxWindows/widgets/manualContour/*.h")
+  FILE(GLOB ${LIBRARY_NAME}_SOURCES_MANUAL_CONTOUR src/interface/wxWindows/widgets/manualContour/*.cpp )
+  
+  FILE(GLOB ${LIBRARY_NAME}_HEADERS_KERNEL "src/kernel/*.h")
+  FILE(GLOB ${LIBRARY_NAME}_SOURCES_KERNEL src/kernel/*.cxx src/kernel/*.cpp src/kernel/*.cc)
+  
+    
   SET ( ${LIBRARY_NAME}_HEADERS
-  	src/interface/wxWindows/manualContour.h
-	src/interface/wxWindows/Contour/ContourCrownWidget.h
-	src/interface/wxWindows/Contour/ContourExtractData.h
-	src/interface/wxWindows/Contour/ContourVOIWidget.h  
-    src/interface/wxWindows/Contour/Propagation.h
-    src/interface/wxWindows/Contour/ExtractControlPoints2D.h
-    src/interface/wxWindows/Contour/AutoControlPoints.h
-    src/interface/wxWindows/Contour/ContourPropagation.h
-    src/interface/wxWindows/Contour/contoursIntersection.h
-    src/interface/wxWindows/Contour/vectorFunctions.h
+  	#src/interface/wxWindows/manualContour.h
+  	#src/interface/wxWindows/wxMaracasMPR.h
+  	#src/interface/wxWindows/wxMaracas_ManualTree_MPR.h
+  	${${LIBRARY_NAME}_HEADERS_WXWIN}  	
+	#src/interface/wxWindows/Contour/AutoControlPoints.h
+	#src/interface/wxWindows/Contour/ContourCrownWidget.h
+	#src/interface/wxWindows/Contour/ContourExtractData.h
+	#src/interface/wxWindows/Contour/ContourPropagation.h
+	#src/interface/wxWindows/Contour/contoursIntersection.h
+	#src/interface/wxWindows/Contour/ContourVOIWidget.h
+	#src/interface/wxWindows/Contour/ExtractControlPoints2D.h  
+    #src/interface/wxWindows/Contour/Propagation.h
+    #src/interface/wxWindows/Contour/vectorFunctions.h
+    ${${LIBRARY_NAME}_HEADERS_CONTOUR}    
 ##    src/interface/wxWindows/wxMaracasImageBrowser02.h
 ##    src/interface/wxWindows/widgets/wxReadingPriorityPanel.h
-    src/interface/wxWindows/widgets/wxVTKRenderWindowInteractor.h     src/interface/wxWindows/widgets/wxVTKRenderWindowInteractorEditContour.h
-    src/interface/wxWindows/widgets/InterfaceVtkPanelWidgets.h
-    src/interface/wxWindows/widgets/vtkClosePolyData.h
-    src/interface/wxWindows/wxMaracasMPR.h
-    src/interface/wxWindows/widgets/wxMPRWidget.h
-    src/interface/wxWindows/widgets/wxMPRBaseData.h
-    src/interface/wxWindows/widgets/wxVtkBaseView.h
-    src/interface/wxWindows/widgets/wxMaracas_ViewerWidget.h 
-    src/interface/wxWindows/widgets/wxMaracas_N_ViewersWidget.h
-    src/interface/wxWindows/wxMaracas_ManualTree_MPR.h
-    src/interface/wxWindows/widgets/wxManualTree_MPRWidget.h
-    src/interface/wxWindows/widgets/ContourView.h
-    src/interface/wxWindows/widgets/PointView.h
-    src/interface/wxWindows/widgets/LineView.h
-    src/interface/wxWindows/widgets/UtilVtk3DGeometriSelection.h
-    src/interface/wxWindows/widgets/pPlotter/HistogramDialog.h
-    src/interface/wxWindows/widgets/pPlotter/HistogramWidget.h
-    src/interface/wxWindows/widgets/pPlotter/pHistogram.h
-    src/interface/wxWindows/widgets/pPlotter/mBarRange.h
-    src/interface/wxWindows/widgets/pPlotter/pLogicalFunction.h
-    src/interface/wxWindows/widgets/pPlotter/LogicalColorBar.h
-    src/interface/wxWindows/widgets/pPlotter/pGraphicalFunction.h
-    src/interface/wxWindows/widgets/pPlotter/pFunctionPoint.h
-    src/interface/wxWindows/widgets/pPlotter/pPlotterWindow.h
-    src/interface/wxWindows/widgets/pPlotter/pPlotterLayer.h
-    src/interface/wxWindows/widgets/pPlotter/pPlotterScaleX.h
-    src/interface/wxWindows/widgets/pPlotter/pPlotterScaleY.h
-    src/interface/wxWindows/widgets/pPlotter/pColorBar.h
-    src/interface/wxWindows/widgets/pPlotter/pFigure.h
-    src/interface/wxWindows/widgets/pPlotter/pColorPoint.h
-    src/interface/wxWindows/widgets/pPlotter/pPlotter.h
-    src/interface/wxWindows/widgets/pPlotter/mathplot.h
-    src/interface/wxWindows/widgets/pPlotter/MaximumsDialog.h
-    src/interface/wxWindows/widgets/pPlotter/Histogram.h
+    #src/interface/wxWindows/widgets/ContourView.h
+    #src/interface/wxWindows/widgets/InterfaceVtkPanelWidgets.h
+    #src/interface/wxWindows/widgets/LineView.h
+    #src/interface/wxWindows/widgets/PointView.h
+    #src/interface/wxWindows/widgets/UtilVtk3DGeometriSelection.h
+    #src/interface/wxWindows/widgets/vtkClosePolyData.h        
+    #src/interface/wxWindows/widgets/wxMaracasIRMView.h
+	#src/interface/wxWindows/widgets/wxMaracasIRMViewManager.h	
+    #src/interface/wxWindows/widgets/wxMaracas_ViewerWidget.h 
+    #src/interface/wxWindows/widgets/wxMaracas_N_ViewersWidget.h        
+    #src/interface/wxWindows/widgets/wxManualTree_MPRWidget.h    
+    #src/interface/wxWindows/widgets/wxMPRBaseData.h
+    #src/interface/wxWindows/widgets/wxMPRWidget.h    
+    #src/interface/wxWindows/widgets/wxSTLWidget_03.h    
+    #src/interface/wxWindows/widgets/wxVTKRenderWindowInteractor.h
+    #src/interface/wxWindows/widgets/wxVTKRenderWindowInteractorEditContour.h
+    #src/interface/wxWindows/widgets/wxVtkBaseView.h
+    ${${LIBRARY_NAME}_HEADERS_WIDGETS}    
+    #src/interface/wxWindows/widgets/pPlotter/Histogram.h
+    #src/interface/wxWindows/widgets/pPlotter/HistogramDialog.h
+    #src/interface/wxWindows/widgets/pPlotter/HistogramWidget.h
+    #src/interface/wxWindows/widgets/pPlotter/LogicalColorBar.h
+    #src/interface/wxWindows/widgets/pPlotter/mBarRange.h
+    #src/interface/wxWindows/widgets/pPlotter/mathplot.h
+    #src/interface/wxWindows/widgets/pPlotter/MaximumsDialog.h
+    #src/interface/wxWindows/widgets/pPlotter/pColorBar.h
+    #src/interface/wxWindows/widgets/pPlotter/pColorPoint.h
+    #src/interface/wxWindows/widgets/pPlotter/pFigure.h
+    #src/interface/wxWindows/widgets/pPlotter/pFunctionPoint.h
+    #src/interface/wxWindows/widgets/pPlotter/pGraphicalFunction.h
+    #src/interface/wxWindows/widgets/pPlotter/pHistogram.h    
+    #src/interface/wxWindows/widgets/pPlotter/pLogicalFunction.h
+    #src/interface/wxWindows/widgets/pPlotter/pPlotter.h
+    #src/interface/wxWindows/widgets/pPlotter/pPlotterLayer.h
+    #src/interface/wxWindows/widgets/pPlotter/pPlotterScaleX.h
+    #src/interface/wxWindows/widgets/pPlotter/pPlotterScaleY.h    
+    #src/interface/wxWindows/widgets/pPlotter/pPlotterWindow.h
+    ${${LIBRARY_NAME}_HEADERS_PPLOTTER}
+	${${LIBRARY_NAME}_HEADERS_MANUAL_CONTOUR}  
+    
     include/matrix.h
-    src/kernel/marImageData.h
-    src/kernel/marDicomBase.h
-  #  src/kernel/marGdcmDicom.h
-    src/kernel/marObject.h
-    src/kernel/volume.hxx
-    src/kernel/marTypes.h
-    src/kernel/marParameters.h
-    src/kernel/marDynData.h
+    
+    #src/kernel/marImageData.h
+    #src/kernel/marDicomBase.h  
+    #src/kernel/marObject.h
+    #src/kernel/volume.hxx
+    #src/kernel/marTypes.h
+    #src/kernel/marParameters.h
+    #src/kernel/marDynData.h
+    #src/kernel/creaMaracasVisu_EXPORT.h 
+	#src/kernel/vtkSTLExtractor.h
+	${${LIBRARY_NAME}_HEADERS_KERNEL}
   )
   #----------------------------------------------------------------------------
 
@@ -108,64 +144,74 @@ IF ( BUILD_${LIBRARY_NAME} )
   # EITHER LIST ALL .cxx, *.cpp, *.cc IN CURRENT DIR USING NEXT LINE:
   #FILE(GLOB ${LIBRARY_NAME}_SOURCES *.cxx *.cpp *.cc)
   # OR MANUALLY LIST YOUR FILES WITH NEXT COMMAND (WITHOUT EXTENSION)
+  
   SET ( ${LIBRARY_NAME}_SOURCES 
-	src/interface/wxWindows/manualContour.cpp
-	src/interface/wxWindows/Contour/ContourCrownWidget.cxx
-	src/interface/wxWindows/Contour/ContourExtractData.cxx
-    src/interface/wxWindows/Contour/ContourVOIWidget.cxx
-    src/interface/wxWindows/Contour/Propagation.cxx
-    src/interface/wxWindows/Contour/ExtractControlPoints2D.cxx
-    src/interface/wxWindows/Contour/AutoControlPoints.cxx
-    src/interface/wxWindows/Contour/ContourPropagation.cxx
-    src/interface/wxWindows/Contour/contoursIntersection.cxx
-    src/interface/wxWindows/Contour/vectorFunctions.cxx
+	#src/interface/wxWindows/manualContour.cpp
+	#src/interface/wxWindows/wxMaracasMPR.cxx
+	#src/interface/wxWindows/wxMaracas_ManualTree_MPR.cxx	
+	${${LIBRARY_NAME}_SOURCES_WXWIN}	
+	#src/interface/wxWindows/Contour/AutoControlPoints.cxx	
+	#src/interface/wxWindows/Contour/ContourCrownWidget.cxx	
+	#src/interface/wxWindows/Contour/ContourExtractData.cxx
+	#src/interface/wxWindows/Contour/ContourPropagation.cxx
+	#src/interface/wxWindows/Contour/contoursIntersection.cxx	
+    #src/interface/wxWindows/Contour/ContourVOIWidget.cxx    
+    #src/interface/wxWindows/Contour/ExtractControlPoints2D.cxx
+    #src/interface/wxWindows/Contour/Propagation.cxx    
+    #src/interface/wxWindows/Contour/vectorFunctions.cxx
+    ${${LIBRARY_NAME}_SOURCES_CONTOUR}
 #    src/interface/wxWindows/wxMaracasImageBrowser02.cxx
 #    src/interface/wxWindows/widgets/wxReadingPriorityPanel.cpp
-    src/interface/wxWindows/widgets/wxVTKRenderWindowInteractor.cxx
-    src/interface/wxWindows/widgets/wxVTKRenderWindowInteractorEditContour.cxx
-    src/interface/wxWindows/widgets/InterfaceVtkPanelWidgets.cxx
-    src/interface/wxWindows/widgets/vtkClosePolyData.cxx
-    src/interface/wxWindows/wxMaracasMPR.cxx
-    src/interface/wxWindows/widgets/wxMPRWidget.cxx
-    src/interface/wxWindows/widgets/wxMPRBaseData.cxx
-    src/interface/wxWindows/widgets/wxVtkBaseView.cxx
-    src/interface/wxWindows/widgets/wxMaracas_ViewerWidget.cxx
-    src/interface/wxWindows/widgets/wxMaracas_N_ViewersWidget.cxx
-    src/interface/wxWindows/wxMaracas_ManualTree_MPR.cxx
-    src/interface/wxWindows/widgets/wxManualTree_MPRWidget.cxx
-    src/interface/wxWindows/res/wxInterface.rc
-    src/interface/wxWindows/widgets/ContourView.cxx
-    src/interface/wxWindows/widgets/PointView.cxx
-    src/interface/wxWindows/widgets/LineView.cxx
-    src/interface/wxWindows/widgets/UtilVtk3DGeometriSelection.cxx
-#####pPlotter classes
-    src/interface/wxWindows/widgets/pPlotter/HistogramDialog.cxx
-    src/interface/wxWindows/widgets/pPlotter/HistogramWidget.cxx
-    src/interface/wxWindows/widgets/pPlotter/pHistogram.cxx
-    src/interface/wxWindows/widgets/pPlotter/mBarRange.cxx
-    src/interface/wxWindows/widgets/pPlotter/pLogicalFunction.cxx
-    src/interface/wxWindows/widgets/pPlotter/LogicalColorBar.cxx
-    src/interface/wxWindows/widgets/pPlotter/pGraphicalFunction.cxx
-    src/interface/wxWindows/widgets/pPlotter/pFunctionPoint.cxx
-    src/interface/wxWindows/widgets/pPlotter/pPlotterWindow.cxx
-    src/interface/wxWindows/widgets/pPlotter/pPlotterLayer.cxx
-    src/interface/wxWindows/widgets/pPlotter/pPlotterScaleX.cxx
-    src/interface/wxWindows/widgets/pPlotter/pPlotterScaleY.cxx
-    src/interface/wxWindows/widgets/pPlotter/pColorBar.cxx
-    src/interface/wxWindows/widgets/pPlotter/pFigure.cxx
-    src/interface/wxWindows/widgets/pPlotter/pColorPoint.cxx
-    src/interface/wxWindows/widgets/pPlotter/pPlotter.cxx
-    src/interface/wxWindows/widgets/pPlotter/mathplot.cxx
-    src/interface/wxWindows/widgets/pPlotter/MaximumsDialog.cxx
-    src/interface/wxWindows/widgets/pPlotter/Histogram.cxx
+    #src/interface/wxWindows/widgets/ContourView.cxx
+    #src/interface/wxWindows/widgets/InterfaceVtkPanelWidgets.cxx
+    #src/interface/wxWindows/widgets/LineView.cxx
+    #src/interface/wxWindows/widgets/PointView.cxx    
+    #src/interface/wxWindows/widgets/UtilVtk3DGeometriSelection.cxx
+    #src/interface/wxWindows/widgets/vtkClosePolyData.cxx
+    #src/interface/wxWindows/widgets/wxManualTree_MPRWidget.cxx
+    #src/interface/wxWindows/widgets/wxMaracas_ViewerWidget.cxx
+    #src/interface/wxWindows/widgets/wxMaracas_N_ViewersWidget.cxx
+	#src/interface/wxWindows/widgets/wxMaracasIRMView.cxx
+	#src/interface/wxWindows/widgets/wxMaracasIRMViewManager.cxx
+	#src/interface/wxWindows/widgets/wxMPRWidget.cxx
+    #src/interface/wxWindows/widgets/wxMPRBaseData.cxx	
+    #src/interface/wxWindows/widgets/wxSTLWidget_03.cxx
+    #src/interface/wxWindows/widgets/wxVTKRenderWindowInteractor.cxx
+    #src/interface/wxWindows/widgets/wxVTKRenderWindowInteractorEditContour.cxx    
+    #src/interface/wxWindows/widgets/wxVtkBaseView.cxx
+    ${${LIBRARY_NAME}_SOURCES_WIDGETS}
+    #src/interface/wxWindows/widgets/pPlotter/Histogram.cxx
+    #src/interface/wxWindows/widgets/pPlotter/HistogramDialog.cxx
+    #src/interface/wxWindows/widgets/pPlotter/HistogramWidget.cxx
+    #src/interface/wxWindows/widgets/pPlotter/LogicalColorBar.cxx
+    #src/interface/wxWindows/widgets/pPlotter/mBarRange.cxx
+    #src/interface/wxWindows/widgets/pPlotter/mathplot.cxx
+    #src/interface/wxWindows/widgets/pPlotter/MaximumsDialog.cxx
+    #src/interface/wxWindows/widgets/pPlotter/pColorBar.cxx
+    #src/interface/wxWindows/widgets/pPlotter/pColorPoint.cxx
+    #src/interface/wxWindows/widgets/pPlotter/pFigure.cxx
+    #src/interface/wxWindows/widgets/pPlotter/pFunctionPoint.cxx
+    #src/interface/wxWindows/widgets/pPlotter/pGraphicalFunction.cxx
+    #src/interface/wxWindows/widgets/pPlotter/pHistogram.cxx    
+    #src/interface/wxWindows/widgets/pPlotter/pLogicalFunction.cxx
+    #src/interface/wxWindows/widgets/pPlotter/pPlotter.cxx
+    #src/interface/wxWindows/widgets/pPlotter/pPlotterLayer.cxx
+    #src/interface/wxWindows/widgets/pPlotter/pPlotterScaleX.cxx
+    #src/interface/wxWindows/widgets/pPlotter/pPlotterScaleY.cxx    
+    #src/interface/wxWindows/widgets/pPlotter/pPlotterWindow.cxx
+    ${${LIBRARY_NAME}_SOURCES_PPLOTTER}
+	${${LIBRARY_NAME}_SOURCES_MANUAL_CONTOUR}
+	
 ###
-	src/kernel/marImageData.cpp
-	src/kernel/marDicomBase.cpp
+	#src/kernel/marImageData.cpp
+	#src/kernel/marDicomBase.cpp
 #	src/kernel/marGdcmDicom.cpp
-	src/kernel/marObject.cpp
-	src/kernel/volume.cxx
-	src/kernel/marParameters.cpp
-	src/kernel/marDynData.cpp	
+	#src/kernel/marObject.cpp
+	#src/kernel/volume.cxx
+	#src/kernel/marParameters.cpp
+	#src/kernel/marDynData.cpp	
+	#src/kernel/vtkSTLExtractor.cpp
+	${${LIBRARY_NAME}_SOURCES_KERNEL}
   )
   #----------------------------------------------------------------------------
 #jhcl-Start===========================================================================
@@ -208,11 +254,9 @@ IF ( BUILD_${LIBRARY_NAME} )
   ENDIF(CREA_VERBOSE_CMAKE)
 
 
-  # MANAGE SHARED LIB
-  CREA_MANAGE_SHARED_LIBRARY(${LIBRARY_NAME})
-
-  # CREATE THE TARGET
-  ADD_LIBRARY(${LIBRARY_NAME} ${${LIBRARY_NAME}_SHARED} ${${LIBRARY_NAME}_SOURCES} ${${LIBRARY_NAME}_HEADERS})
+  
+  # CREATE THE TARGET  
+  ADD_LIBRARY (${LIBRARY_NAME} ${${LIBRARY_NAME}_SHARED} ${${LIBRARY_NAME}_SOURCES} ${${LIBRARY_NAME}_HEADERS})
 
   # LINK
   TARGET_LINK_LIBRARIES(${LIBRARY_NAME} ${${LIBRARY_NAME}_LINK_LIBRARIES})
@@ -235,8 +279,10 @@ SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_INCLUDE_PATHS
     lib/maracasVisuLib/src/kernel
 	#${MARACAS_SOURCE_DIR}/src/SnakeIsoContour+Deriche
     lib/maracasVisuLib/src/interface/wxWindows
+    lib/maracasVisuLib/src/interface/wxWindows/Contour
     lib/maracasVisuLib/src/interface/wxWindows/widgets
     lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter
+	lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour
 	lib/maracasVisuLib/../../../
 )
 IF ( ${PROJECT_BINARY_DIR} STREQUAL ${EXECUTABLE_OUTPUT_PATH} )
@@ -253,8 +299,7 @@ IF(UNIX)
   SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_LIBRARY_PATHS lib)
 ELSE(UNIX)
   SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_LIBRARY_PATHS
-    ${CILFC_EXECUTABLE_OUTPUT_REL_PATH}/Debug
-    ${CILFC_EXECUTABLE_OUTPUT_REL_PATH}/Release)
+    ${CILFC_EXECUTABLE_OUTPUT_REL_PATH})
   SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_LIBRARY_PATHS bin)
 ENDIF(UNIX)
   SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_INCLUDE_PATHS include/${LIBRARY_NAME})
@@ -272,9 +317,15 @@ INSTALL(
   FILES ${${LIBRARY_NAME}_HEADERS}
   DESTINATION ${${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_INCLUDE_PATHS}
   ) 
-INSTALL(
-  TARGETS ${LIBRARY_NAME}
-  DESTINATION bin )
+IF(WIN32)	
+  INSTALL(
+    TARGETS ${LIBRARY_NAME}
+    DESTINATION bin)
+ELSE(WIN32)
+  INSTALL(
+    TARGETS ${LIBRARY_NAME}
+    DESTINATION lib)
+ENDIF(WIN32)