X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2Fkernel_ManagerContour_NDimensions%2FCMakeLists.txt;h=0ed086642a184ab549a963e8e74be0be015123dd;hb=3ede91ddd835ef6f6eaf9e72956be7c6ebd69ad4;hp=0fcd339896cb826bf7f541e4edd6a847dc7a915b;hpb=ac446509c75b87e4e5e0d5286dfc1876038d60ad;p=creaContours.git

diff --git a/lib/kernel_ManagerContour_NDimensions/CMakeLists.txt b/lib/kernel_ManagerContour_NDimensions/CMakeLists.txt
index 0fcd339..0ed0866 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,19 +52,23 @@ 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} )