X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2FCMakeLists.txt;h=fcfdf413a5124f94ae7cfebe21515db21b4bf3b2;hb=54bb3fba5f59ca71cb82d87043e21354dd85e7aa;hp=25374ae5204f801373f061b36a2ed4cb5c40436d;hpb=d7d3ec17199e6b725bd375fdfe1085eeb35b34cc;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/CMakeLists.txt b/lib/maracasVisuLib/CMakeLists.txt
index 25374ae..fcfdf41 100644
--- a/lib/maracasVisuLib/CMakeLists.txt
+++ b/lib/maracasVisuLib/CMakeLists.txt
@@ -1,8 +1,12 @@
 #----------------------------------------------------------------------------
-# SET THE NAME OF YOUR LIBRARY
+# USER ! SET THE NAME OF YOUR LIBRARY
+SET ( LIBRARY_NAME   creaMaracasVisu  )
 
+#EED 5/Mars/2010
+IF (UNIX)
+  add_definitions(-fPIC)
+ENDIF(UNIX)
 
-SET ( LIBRARY_NAME   creaMaracasVisu  )
 #----------------------------------------------------------------------------
 
 #----------------------------------------------------------------------------
@@ -39,7 +43,7 @@ IF ( BUILD_${LIBRARY_NAME} )
 	src/CutModule/interface
 	src/CutModule/kernel
 	../../../
-	
+
 )
 	#message(jhcl\n\n ${crea_LIBRARIES})
 	#INCLUDE(include/Modules/MARACAS_Find_LIBIDO.cmake)
@@ -51,36 +55,36 @@ 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_ThresholdImageView "src/interface/wxWindows/widgets/ThresholdImageView/*.h")
   FILE(GLOB ${LIBRARY_NAME}_SOURCES_ThresholdImageView src/interface/wxWindows/widgets/ThresholdImageView/*.cxx src/interface/wxWindows/widgets/ThresholdImageView/*.cpp src/interface/wxWindows/widgets/ThresholdImageView/*.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
-  	${${LIBRARY_NAME}_HEADERS_WXWIN}  	
+  	${${LIBRARY_NAME}_HEADERS_WXWIN}
     	${${LIBRARY_NAME}_HEADERS_CONTOUR}
    	${${LIBRARY_NAME}_HEADERS_ThresholdImageView}
-    	${${LIBRARY_NAME}_HEADERS_WIDGETS}    
+    	${${LIBRARY_NAME}_HEADERS_WIDGETS}
     	${${LIBRARY_NAME}_HEADERS_PPLOTTER}
-    	${${LIBRARY_NAME}_HEADERS_MANUAL_CONTOUR}  
+    	${${LIBRARY_NAME}_HEADERS_MANUAL_CONTOUR}
     	include/matrix.h
 	${${LIBRARY_NAME}_HEADERS_KERNEL}
   )
@@ -91,21 +95,21 @@ 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 
-	${${LIBRARY_NAME}_SOURCES_WXWIN}	
+	${${LIBRARY_NAME}_SOURCES_WXWIN}
     	${${LIBRARY_NAME}_SOURCES_CONTOUR}
     	${${LIBRARY_NAME}_SOURCES_ThresholdImageView}
     	${${LIBRARY_NAME}_SOURCES_WIDGETS}
     	${${LIBRARY_NAME}_SOURCES_PPLOTTER}
-	${${LIBRARY_NAME}_SOURCES_MANUAL_CONTOUR}	
+	${${LIBRARY_NAME}_SOURCES_MANUAL_CONTOUR}
 	${${LIBRARY_NAME}_SOURCES_KERNEL}
   )
   #----------------------------------------------------------------------------
 #jhcl-Start===========================================================================
 #message(jhcl4${LIBIDO_LIBRARIES})
 #jhcl-End===========================================================================
-	  
+
   #----------------------------------------------------------------------------
   # LIBRARY DEPENDENCIES (LIBRARIES TO LINK WITH)
   SET ( ${LIBRARY_NAME}_LINK_LIBRARIES
@@ -143,8 +147,8 @@ IF ( BUILD_${LIBRARY_NAME} )
   ENDIF(CREA_VERBOSE_CMAKE)
 
 
-  
-  # CREATE THE TARGET  
+
+  # CREATE THE TARGET
   ADD_LIBRARY (${LIBRARY_NAME} ${${LIBRARY_NAME}_SHARED} ${${LIBRARY_NAME}_SOURCES} ${${LIBRARY_NAME}_HEADERS})
 
   # LINK
@@ -153,7 +157,7 @@ IF ( BUILD_${LIBRARY_NAME} )
  # Sets the settings for macro CREA_ADVANCED_INSTALL_LIBRARY_FOR_CMAKE
   SET(${LIBRARY_NAME}_INSTALL_FOLDER ${LIBRARY_NAME})
   SET(${LIBRARY_NAME}_LIBRARIES ${LIBRARY_NAME})
- 
+
 #  FILE(RELATIVE_PATH
  #   ${LIBRARY_NAME}_BUILD_TREE_RELATIVE_INCLUDE_PATHS
  #   ${PROJECT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
@@ -184,9 +188,8 @@ ELSE ( ${PROJECT_BINARY_DIR} STREQUAL ${EXECUTABLE_OUTPUT_PATH} )
 ENDIF ( ${PROJECT_BINARY_DIR} STREQUAL ${EXECUTABLE_OUTPUT_PATH} )
 
 IF(UNIX)
-  SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_LIBRARY_PATHS
-    ${CILFC_EXECUTABLE_OUTPUT_REL_PATH})
-  SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_LIBRARY_PATHS lib)
+  SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_LIBRARY_PATHS ${CILFC_EXECUTABLE_OUTPUT_REL_PATH})
+  SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_LIBRARY_PATHS ${CREAMARACASVISU_LIB_PATH} )
 ELSE(UNIX)
   SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_LIBRARY_PATHS
     ${CILFC_EXECUTABLE_OUTPUT_REL_PATH})
@@ -208,15 +211,15 @@ CREA_ADVANCED_INSTALL_LIBRARY_FOR_CMAKE(${LIBRARY_NAME})
 INSTALL(
   FILES ${${LIBRARY_NAME}_HEADERS}
   DESTINATION ${${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_INCLUDE_PATHS}
-  ) 
-IF(WIN32)	
+  )
+IF(WIN32)
   INSTALL(
     TARGETS ${LIBRARY_NAME}
     DESTINATION bin)
 ELSE(WIN32)
   INSTALL(
     TARGETS ${LIBRARY_NAME}
-    DESTINATION lib)
+    DESTINATION ${CREAMARACASVISU_LIB_PATH})
 ENDIF(WIN32)
   
   #----------------------------------------------------------------------------