X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2Fkernel_ManagerContour_NDimensions%2FCMakeLists.txt;h=82fc89c9e8199f575b426ad1efbd24ffc2196bdb;hb=ffd5933600d8bad1de6ee62c305cc26a046166dd;hp=8af7af391fafd42c37a4020a37fd67dfe16059d7;hpb=87df9193d6218dbecee6a798f7385cd3d113ce8f;p=creaContours.git

diff --git a/lib/kernel_ManagerContour_NDimensions/CMakeLists.txt b/lib/kernel_ManagerContour_NDimensions/CMakeLists.txt
index 8af7af3..82fc89c 100644
--- a/lib/kernel_ManagerContour_NDimensions/CMakeLists.txt
+++ b/lib/kernel_ManagerContour_NDimensions/CMakeLists.txt
@@ -29,7 +29,7 @@ IF ( BUILD_${LIBRARY_NAME} )
   #----------------------------------------------------------------------------
   # LIBRARY SOURCES (TO BE COMPILED)
   # EITHER LIST ALL .cxx, *.cpp, *.cc IN CURRENT DIR USING NEXT LINE:
-  FILE(GLOB ${LIBRARY_NAME}_SOURCES *.cxx *.cpp *.cc *.h *.txx)
+  FILE(GLOB ${LIBRARY_NAME}_SOURCES *.cxx *.cpp *.cc *.txx)
   # OR MANUALLY LIST YOUR FILES WITH NEXT COMMAND (WITHOUT EXTENSION)
   #  SET ( ${LIBRARY_NAME}_SOURCES 
   #   
@@ -38,6 +38,12 @@ IF ( BUILD_${LIBRARY_NAME} )
 
   #----------------------------------------------------------------------------
   # LIBRARY DEPENDENCIES (LIBRARIES TO LINK WITH)
+  #JCP parserOsirix
+	OPTION ( BUILD_ParserOsirix  "Build ParserOsirix ?" OFF)
+	IF(BUILD_ParserOsirix)
+		INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/ParserOsirix/ParserOsirix.cmake)
+	ENDIF(BUILD_ParserOsirix)
+  #JCP parserOsirix
 
 #  MESSAGE(ERROR         ${creaMaracasVisu_LIBRARIES})
   SET ( ${LIBRARY_NAME}_LINK_LIBRARIES
@@ -46,21 +52,25 @@ IF ( BUILD_${LIBRARY_NAME} )
     ${WXWIDGETS_LIBRARIES}
     ${VTK_LIBRARIES}
     ${creaMaracasVisu_LIBRARIES}
+	${ParserOsirix_LIBRARIES}
     #    ${ITK_LIBRARIES}
     #    ${GDCM_LIBRARIES}
     #    ${BOOST_LIBRARIES}
     )
   #----------------------------------------------------------------------------
 
+  SOURCE_GROUP("Source Files" FILES ${${LIBRARY_NAME}_SOURCES})
+  SOURCE_GROUP("Header Files" FILES ${${LIBRARY_NAME}_HEADERS})
   
+    
   #----------------------------------------------------------------------------
   # MACRO WHICH DOES ALL THE JOB : BUILD AND INSTALL
   #CREA_ADD_LIBRARY( ${LIBRARY_NAME} )
   #----------------------------------------------------------------------------
 
-  ADD_LIBRARY(${LIBRARY_NAME} STATIC  ${${LIBRARY_NAME}_SOURCES})
+  ADD_LIBRARY(${LIBRARY_NAME} STATIC  ${${LIBRARY_NAME}_SOURCES} ${ParserOsirix_SOURCES} ${${LIBRARY_NAME}_HEADERS} ${ParserOsirix_HEADERS})
   # LINK
-  TARGET_LINK_LIBRARIES(${LIBRARY_NAME} ${${LIBRARY_NAME}_LINK_LIBRARIES})
+  TARGET_LINK_LIBRARIES(${LIBRARY_NAME} ${${LIBRARY_NAME}_LINK_LIBRARIES} )
   
   #---------------------------------------------------------------------------
   
@@ -70,16 +80,11 @@ IF ( BUILD_${LIBRARY_NAME} )
     FILES ${${LIBRARY_NAME}_HEADERS}
     DESTINATION ${${LIBRARY_NAME_BASE}_INSTALL_TREE_RELATIVE_INCLUDE_PATHS}
     ) 
-  IF(WIN32)	
-    INSTALL(
-      TARGETS ${LIBRARY_NAME}
-      DESTINATION bin)
-  ELSE(WIN32)
-    INSTALL(
-      TARGETS ${LIBRARY_NAME}
-      DESTINATION lib)
-  ENDIF(WIN32)
-  
+
+  INSTALL(
+    TARGETS ${LIBRARY_NAME}
+    DESTINATION ${CMAKE_CREA_LIB_PATH} 
+  )
 
   
   #---------------------------------------------------------------------------