X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FCMakeLists.txt;h=13446594fd16d6097f738ac2fea292258d3fdf5b;hb=b029354f54449e058d14c671e7155e65b4086de6;hp=ef0d34a1810150a868bec1b787c473f0554873af;hpb=46b16f5dac2148fa2d7ef81946a5e703447df88a;p=creaImageIO.git

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ef0d34a..1344659 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -24,7 +24,6 @@ SET( SRCS
 
   creaImageIOWxGimmickDialog
 
-
 #  creaImageIOWxDicomDatabaseTreeView
 #  creaImageIOWxDicomDatabaseTreeViewSettings
 #  creaImageIOWxDicomNodeFieldsView
@@ -88,15 +87,21 @@ INSTALL(
     ${LIBRARY_NAME}_BUILD_TREE_RELATIVE_INCLUDE_PATHS 
     ${PROJECT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
     )
+  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 
-      ${EXECUTABLE_OUTPUT_REL_PATH})
+      ${CILFC_EXECUTABLE_OUTPUT_REL_PATH})
     SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_LIBRARY_PATHS lib)
   ELSE(UNIX)
     SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_LIBRARY_PATHS 
-      ${EXECUTABLE_OUTPUT_REL_PATH}/Debug
-      ${EXECUTABLE_OUTPUT_REL_PATH}/Release)
+      ${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})
@@ -113,3 +118,8 @@ SET(${LIBRARY_NAME}_ADDITIONAL_USE_FILE
   
 #CREA_INSTALL_LIBRARY_FOR_CMAKE(creaImageIO)
 #-----------------------------------------------------------------------------
+
+OPTION( BUILD_DOXYGEN_DOC "Build doxygen doc ?" OFF)
+IF(BUILD_DOXYGEN_DOC)
+  SUBDIRS(doxygen)
+ENDIF(BUILD_DOXYGEN_DOC)