]> Creatis software - creaMaracasVisu.git/blobdiff - lib/maracasVisuLib/CMakeLists.txt
git://git.creatis.insa-lyon.fr / creaMaracasVisu.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Diego Caceres: Changes in CMakeLists.txt.
[creaMaracasVisu.git] / lib / maracasVisuLib / CMakeLists.txt
diff --git a/lib/maracasVisuLib/CMakeLists.txt b/lib/maracasVisuLib/CMakeLists.txt
index c606552f40340188b7f00e80cc89e6456263703f..949c166299061b1cedf57f2489039189186a2c54 100644 (file)
--- 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  )
 #----------------------------------------------------------------------------
 
 #----------------------------------------------------------------------------
@@ -22,22 +26,7 @@ IF ( BUILD_${LIBRARY_NAME} )
   #----------------------------------------------------------------------------
   # BUILD LIBRARY
   #----------------------------------------------------------------------------
-#jhcl-Start===========================================================================
-  INCLUDE_DIRECTORIES(
-    include
-    src
-       #${MARACAS_SOURCE_DIR}/src/axe3DVTK
-       #  ${MARACAS_SOURCE_DIR}/src/interface
-    src/kernel
-       #${MARACAS_SOURCE_DIR}/src/SnakeIsoContour+Deriche
-    src/interface/wxWindows
-    src/interface/wxWindows/Contour
-    src/interface/wxWindows/widgets
-    src/interface/wxWindows/widgets/pPlotter
-       src/interface/wxWindows/widgets/manualContour
-       src/interface/wxWindows/widgets/ThresholdImageView
-       ../../../
-)
+
        #message(jhcl\n\n ${crea_LIBRARIES})
        #INCLUDE(include/Modules/MARACAS_Find_LIBIDO.cmake)
        #SET(CREA_LIBRARIES C:/creaBin/Debug/crea.lib)
@@ -48,38 +37,57 @@ 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)
-  
+
+#DCH
+  FILE(GLOB ${LIBRARY_NAME}_HEADERS_CBUTTONCONTAINER "src/interface/wxWindows/widgets/creaButtonContainer/model/include/*.h" "src/interface/wxWindows/widgets/creaButtonContainer/view/include/*.h" "src/interface/wxWindows/widgets/creaButtonContainer/controller/include/*.h" )
+  FILE(GLOB ${LIBRARY_NAME}_SOURCES_CBUTTONCONTAINER src/interface/wxWindows/widgets/creaButtonContainer/model/src/*.cxx src/interface/wxWindows/widgets/creaButtonContainer/view/src/*.cxx src/interface/wxWindows/widgets/creaButtonContainer/controller/src/*.cxx )
+
+  FILE(GLOB ${LIBRARY_NAME}_HEADERS_CPBUTTONCONTAINER "src/interface/wxWindows/widgets/creaPanelButtonContainer/include/*.h" )
+  FILE(GLOB ${LIBRARY_NAME}_SOURCES_CPBUTTONCONTAINER src/interface/wxWindows/widgets/creaPanelButtonContainer/src/*.cxx )  
+#DCH
+
   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_MANUAL_PAINT "src/interface/wxWindows/widgets/manualPaint/*.h")
+  FILE(GLOB ${LIBRARY_NAME}_SOURCES_MANUAL_PAINT src/interface/wxWindows/widgets/manualPaint/*.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)
-  
-    
+
+FILE(GLOB ${LIBRARY_NAME}_HEADERS_CUTMODULE src/CutModule/interface/*.h src/CutModule/kernel/*.h)
+  FILE(GLOB ${LIBRARY_NAME}_SOURCES_CUTMODULE src/CutModule/interface/*.cxx src/CutModule/kernel/*.cxx)
+
+
   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}
+       ${${LIBRARY_NAME}_HEADERS_MANUAL_PAINT}
        include/matrix.h
        ${${LIBRARY_NAME}_HEADERS_KERNEL}
+       ${${LIBRARY_NAME}_HEADERS_CUTMODULE}
+       ${${LIBRARY_NAME}_HEADERS_CBUTTONCONTAINER}
+       ${${LIBRARY_NAME}_HEADERS_CPBUTTONCONTAINER}
+       
   )
   #----------------------------------------------------------------------------
 
@@ -88,21 +96,25 @@ 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_MANUAL_PAINT}
        ${${LIBRARY_NAME}_SOURCES_KERNEL}
+       ${${LIBRARY_NAME}_SOURCES_CUTMODULE}
+       ${${LIBRARY_NAME}_SOURCES_CBUTTONCONTAINER}
+       ${${LIBRARY_NAME}_SOURCES_CPBUTTONCONTAINER}
   )
   #----------------------------------------------------------------------------
 #jhcl-Start===========================================================================
 #message(jhcl4${LIBIDO_LIBRARIES})
 #jhcl-End===========================================================================
-         
+
   #----------------------------------------------------------------------------
   # LIBRARY DEPENDENCIES (LIBRARIES TO LINK WITH)
   SET ( ${LIBRARY_NAME}_LINK_LIBRARIES
@@ -118,6 +130,7 @@ IF ( BUILD_${LIBRARY_NAME} )
                ${CREA_LIBRARIES}
        #${BOOST_LIBRARIES}
        #jhcl-End===========================================================================
+               #creaMaracasVisu_CutModule_interface
     )
   #----------------------------------------------------------------------------
 
@@ -139,8 +152,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
@@ -149,7 +162,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}
@@ -171,6 +184,8 @@ SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_INCLUDE_PATHS
        lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView
        lib/maracasVisuLib/../../../
 )
+
+
 IF ( ${PROJECT_BINARY_DIR} STREQUAL ${EXECUTABLE_OUTPUT_PATH} )
   SET(CILFC_EXECUTABLE_OUTPUT_REL_PATH ".")
 ELSE ( ${PROJECT_BINARY_DIR} STREQUAL ${EXECUTABLE_OUTPUT_PATH} )
@@ -180,9 +195,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})
@@ -196,29 +210,28 @@ ENDIF(UNIX)
 #  ${PROJECT_SOURCE_DIR}/src/AdditionalUsecreaImageIO.cmake.in)
 
 # Invoke the advanced macro
+
+
 CREA_ADVANCED_INSTALL_LIBRARY_FOR_CMAKE(${LIBRARY_NAME})
 
 # INSTALLS LIBRARY
 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)
-
-
-  
-  
   
   #----------------------------------------------------------------------------
 
-
   #---------------------------------------------------------------------------
 ENDIF ( BUILD_${LIBRARY_NAME} )
+
+ADD_SUBDIRECTORY(src)
Medical image visualization library