Replace deprecated SUBDIRS by ADD_SUBDIRECTORY

[creaBruker.git] / lib / src1 / CMakeLists.txt

diff --git a/lib/src1/CMakeLists.txt b/lib/src1/CMakeLists.txt
index 5cf7902fc32a0d3a69ccebfe92632de67450569c..7270c18b3be0e07c30368e7cc91df760b540c152 100644 (file)
--- a/lib/src1/CMakeLists.txt
+++ b/lib/src1/CMakeLists.txt
@@ -39,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
@@ -68,14 +78,46 @@ IF ( BUILD_${LIBRARY_NAME} )
 )
   OPTION( BUILD_DOXYGEN_DOC "Build doxygen doc ?" OFF)
 IF(BUILD_DOXYGEN_DOC)
-  SUBDIRS(doxygen)
+  ADD_SUBDIRECTORY(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} )