EED cvs conflict

[crea.git] / cmake / CREAMacro_InstallLibraryForCMake.cmake

diff --git a/cmake/CREAMacro_InstallLibraryForCMake.cmake b/cmake/CREAMacro_InstallLibraryForCMake.cmake
index 4e08f05b476d98e6aa2dd5e5b9af6ecf4217794b..6990a2fcff530a6590b52aceb42b1a471cc4d1de 100644 (file)
--- a/cmake/CREAMacro_InstallLibraryForCMake.cmake
+++ b/cmake/CREAMacro_InstallLibraryForCMake.cmake
@@ -260,30 +260,42 @@ ENDMACRO(CREA_ADVANCED_INSTALL_LIBRARY_FOR_CMAKE)
 
 
 #-----------------------------------------------------------------------------
-MACRO(CREA_INSTALL_LIBRARY_FOR_CMAKE LIBRARY_NAME)
+MACRO(CREA_INSTALL_LIBRARY_FOR_CMAKE LIBRARY_NAME1)
   
   # Sets the settings to default values
-  SET(${LIBRARY_NAME}_INSTALL_FOLDER ${LIBRARY_NAME})
-  SET(${LIBRARY_NAME}_LIBRARIES ${LIBRARY_NAME})
+  SET(${LIBRARY_NAME1}_INSTALL_FOLDER ${LIBRARY_NAME1})
+  SET(${LIBRARY_NAME1}_LIBRARIES ${LIBRARY_NAME1})
   
   FILE(RELATIVE_PATH 
-    ${LIBRARY_NAME}_BUILD_TREE_RELATIVE_INCLUDE_PATHS 
+    ${LIBRARY_NAME1}_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})
+    SET(${LIBRARY_NAME1}_BUILD_TREE_RELATIVE_LIBRARY_PATHS 
+      ${CILFC_EXECUTABLE_OUTPUT_REL_PATH})
+    SET(${LIBRARY_NAME1}_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)
+    SET(${LIBRARY_NAME1}_BUILD_TREE_RELATIVE_LIBRARY_PATHS 
+      ${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_NAME}_INSTALL_TREE_RELATIVE_INCLUDE_PATHS include/${LIBRARY_NAME})
-  SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_LIBRARY_PATHS lib)
+  SET(${LIBRARY_NAME1}_INSTALL_TREE_RELATIVE_INCLUDE_PATHS include/${LIBRARY_NAME1})
   
   # Invoke the advanced macro
-  CREA_ADVANCED_INSTALL_LIBRARY_FOR_CMAKE(${LIBRARY_NAME})
+  CREA_ADVANCED_INSTALL_LIBRARY_FOR_CMAKE(${LIBRARY_NAME1})
 
 
 ENDMACRO(CREA_INSTALL_LIBRARY_FOR_CMAKE)