X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2Fkernel_ManagerContour_NDimensions%2FCMakeLists.txt;h=6330662c1c85722881e8b65f2211d1a84a86fcd5;hb=refs%2Fheads%2Fvtk9itk4wx3-macos;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..6330662 100644
--- a/lib/kernel_ManagerContour_NDimensions/CMakeLists.txt
+++ b/lib/kernel_ManagerContour_NDimensions/CMakeLists.txt
@@ -1,3 +1,28 @@
+# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+#                        pour la Sant�)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+# Previous Authors : Laurent Guigues, Jean-Pierre Roux
+# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+#
+#  This software is governed by the CeCILL-B license under French law and
+#  abiding by the rules of distribution of free software. You can  use,
+#  modify and/ or redistribute the software under the terms of the CeCILL-B
+#  license as circulated by CEA, CNRS and INRIA at the following URL
+#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+#  or in the file LICENSE.txt.
+#
+#  As a counterpart to the access to the source code and  rights to copy,
+#  modify and redistribute granted by the license, users are provided only
+#  with a limited warranty  and the software's author,  the holder of the
+#  economic rights,  and the successive licensors  have only  limited
+#  liability.
+#
+#  The fact that you are presently reading this means that you have had
+#  knowledge of the CeCILL-B license and that you accept its terms.
+# ------------------------------------------------------------------------ */
+
 #----------------------------------------------------------------------------
 # SET THE NAME OF YOUR LIBRARY
 SET ( LIBRARY_NAME   kernel_ManagerContour_NDimensions_lib  )
@@ -19,7 +44,7 @@ IF ( BUILD_${LIBRARY_NAME} )
   #----------------------------------------------------------------------------
   # LIBRARY HEADERS (TO BE INSTALLED)
   # EITHER LIST ALL .h IN CURRENT DIR USING NEXT LINE:
-  FILE(GLOB ${LIBRARY_NAME}_HEADERS "*.h" "*.txx")
+  FILE(GLOB_RECURSE ${LIBRARY_NAME}_HEADERS "*.h" "*.txx")
   # OR MANUALLY LIST YOUR HEADERS WITH NEXT COMMAND
   #  SET ( ${LIBRARY_NAME}_HEADERS
   #
@@ -29,7 +54,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 +63,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 +77,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 +105,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} 
+  )
 
   
   #---------------------------------------------------------------------------