EED cvs conflict

[crea.git] / cmake / CREAMacro_InstallLibraryForCMake.cmake

diff --git a/cmake/CREAMacro_InstallLibraryForCMake.cmake b/cmake/CREAMacro_InstallLibraryForCMake.cmake
index 12a434eadea5e7353ff99157c613ac819420b65c..6990a2fcff530a6590b52aceb42b1a471cc4d1de 100644 (file)
--- a/cmake/CREAMacro_InstallLibraryForCMake.cmake
+++ b/cmake/CREAMacro_InstallLibraryForCMake.cmake
@@ -270,9 +270,15 @@ MACRO(CREA_INSTALL_LIBRARY_FOR_CMAKE LIBRARY_NAME1)
     ${LIBRARY_NAME1}_BUILD_TREE_RELATIVE_INCLUDE_PATHS 
     ${PROJECT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
     )
-  FILE(RELATIVE_PATH 
-    CILFC_EXECUTABLE_OUTPUT_REL_PATH
-    ${PROJECT_BINARY_DIR} ${EXECUTABLE_OUTPUT_PATH})
+  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_NAME1}_BUILD_TREE_RELATIVE_LIBRARY_PATHS 
@@ -280,8 +286,10 @@ MACRO(CREA_INSTALL_LIBRARY_FOR_CMAKE LIBRARY_NAME1)
     SET(${LIBRARY_NAME1}_INSTALL_TREE_RELATIVE_LIBRARY_PATHS lib)
   ELSE(UNIX)
     SET(${LIBRARY_NAME1}_BUILD_TREE_RELATIVE_LIBRARY_PATHS 
-      ${CILFC_EXECUTABLE_OUTPUT_REL_PATH}/Debug
-      ${CILFC_EXECUTABLE_OUTPUT_REL_PATH}/Release)
+      ${CILFC_EXECUTABLE_OUTPUT_REL_PATH} )
+# LG 15/01/09 : Bug
+#      ${CILFC_EXECUTABLE_OUTPUT_REL_PATH}/Debug
+#     ${CILFC_EXECUTABLE_OUTPUT_REL_PATH}/Release)
     SET(${LIBRARY_NAME1}_INSTALL_TREE_RELATIVE_LIBRARY_PATHS bin)
   ENDIF(UNIX)
   SET(${LIBRARY_NAME1}_INSTALL_TREE_RELATIVE_INCLUDE_PATHS include/${LIBRARY_NAME1})