X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fsrc1%2FCMakeLists.txt;h=6cc702baf977541394889fb21f478000c29127d3;hb=cc4fb89e6ab8668e7e8830a2e65dc53dc1773de5;hp=c0c03a590ee9cb95119903a20609ad0cd8c9b442;hpb=0194cf3ca5e4249a389cc809d3de6fae07249fa4;p=creaBruker.git

diff --git a/lib/src1/CMakeLists.txt b/lib/src1/CMakeLists.txt
index c0c03a5..6cc702b 100644
--- a/lib/src1/CMakeLists.txt
+++ b/lib/src1/CMakeLists.txt
@@ -15,7 +15,11 @@ IF ( BUILD_${LIBRARY_NAME} )
   #----------------------------------------------------------------------------
   # BUILD LIBRARY
   #----------------------------------------------------------------------------
-
+  INCLUDE_DIRECTORIES(
+    include
+	../../../
+)
+  
   #----------------------------------------------------------------------------
   # LIBRARY HEADERS (TO BE INSTALLED)
   # EITHER LIST ALL .h IN CURRENT DIR USING NEXT LINE:
@@ -35,7 +39,17 @@ IF ( BUILD_${LIBRARY_NAME} )
   #
   #    )
   #----------------------------------------------------------------------------
-
+  #TO SWITCH BETWEEN GDCM AND GDCM2
+  message ("avant... ${creaBruker_SOURCES}")
+if(USE_GDCM2)
+	LIST(REMOVE_ITEM ${LIBRARY_NAME}_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/bruker2dicom.cxx")
+	LIST(REMOVE_ITEM ${LIBRARY_NAME}_HEADERS "${CMAKE_CURRENT_SOURCE_DIR}/ bruker2dicom.h")
+endif()
+if(USE_GDCM)
+	LIST(REMOVE_ITEM ${LIBRARY_NAME}_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/bruker2dicom2.cxx")
+	LIST(REMOVE_ITEM ${LIBRARY_NAME}_HEADERS "${CMAKE_CURRENT_SOURCE_DIR}/ bruker2dicom2.h")
+endif()
+  message ("apres... ${creaBruker_SOURCES}")
   #----------------------------------------------------------------------------
   # LIBRARY DEPENDENCIES (LIBRARIES TO LINK WITH)
   SET ( ${LIBRARY_NAME}_LINK_LIBRARIES
@@ -48,12 +62,62 @@ IF ( BUILD_${LIBRARY_NAME} )
     )
   #----------------------------------------------------------------------------
 
+  IF(CREA_VERBOSE_CMAKE)
+    MESSAGE(STATUS "** Creating library ${LIBRARY_NAME}")
+    MESSAGE(STATUS "   Headers  : ${${LIBRARY_NAME}_HEADERS}")
+    MESSAGE(STATUS "   Sources  : ${${LIBRARY_NAME}_SOURCES}")
+    MESSAGE(STATUS "   Link libs: ${${LIBRARY_NAME}_LINK_LIBRARIES}")
+  ENDIF(CREA_VERBOSE_CMAKE)
+  
+  
+  #----------------------------------------------------------------------------
+  
+  SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_INCLUDE_PATHS
+    lib/src1/
+	lib/src1/../../../
+)
+  OPTION( BUILD_DOXYGEN_DOC "Build doxygen doc ?" OFF)
+IF(BUILD_DOXYGEN_DOC)
+  SUBDIRS(doxygen)
+ENDIF(BUILD_DOXYGEN_DOC)
+  
+
+
+
+
+
+##  IF ( ${PROJECT_BINARY_DIR} STREQUAL ${EXECUTABLE_OUTPUT_PATH} )
+##    SET(CILFC_EXECUTABLE_OUTPUT_REL_PATH ".")
+##  ELSE ( ${PROJECT_BINARY_DIR} STREQUAL ${EXECUTABLE_OUTPUT_PATH} )
+##    FILE(RELATIVE_PATH 
+##      CILFC_EXECUTABLE_OUTPUT_REL_PATH
+##      ${PROJECT_BINARY_DIR} ${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)
+##  ELSE(UNIX)
+##    SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_LIBRARY_PATHS 
+##      ${CILFC_EXECUTABLE_OUTPUT_REL_PATH})
+##    SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_LIBRARY_PATHS bin)
+##  ENDIF(UNIX)
+##  SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_INCLUDE_PATHS include/${LIBRARY_NAME}) 
+##  
+##  #EED ????  set(CILFC_EXECUTABLE_OUTPUT_REL_PATH ".")
 
   #----------------------------------------------------------------------------
   # MACRO WHICH DOES ALL THE JOB : BUILD AND INSTALL
   CREA_ADD_LIBRARY( ${LIBRARY_NAME} )
+  # Invoke the advanced macro
+##EED  CREA_ADVANCED_INSTALL_LIBRARY_FOR_CMAKE(${LIBRARY_NAME})
   #----------------------------------------------------------------------------
 
 
+
+
+
+
   #---------------------------------------------------------------------------
 ENDIF ( BUILD_${LIBRARY_NAME} )