]> Creatis software - creaImageIO.git/commitdiff
*** empty log message ***
authorguigues <guigues>
Fri, 21 Nov 2008 13:15:43 +0000 (13:15 +0000)
committerguigues <guigues>
Fri, 21 Nov 2008 13:15:43 +0000 (13:15 +0000)
src/CMakeLists.txt

index f65cbada0443a048df5cf77ebb96fdd107e283fa..c406d94f4f522e44230a755b684ea70d643b0b98 100644 (file)
@@ -88,15 +88,22 @@ INSTALL(
     ${LIBRARY_NAME}_BUILD_TREE_RELATIVE_INCLUDE_PATHS 
     ${PROJECT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
     )
     ${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 
 
   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 
     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}/Debug
+      ${CILFC_EXECUTABLE_OUTPUT_REL_PATH}/Release)
     SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_LIBRARY_PATHS bin)
   ENDIF(UNIX)
   SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_INCLUDE_PATHS include/${LIBRARY_NAME})
     SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_LIBRARY_PATHS bin)
   ENDIF(UNIX)
   SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_INCLUDE_PATHS include/${LIBRARY_NAME})