Fixed install problem

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 96bc9457627abacef9320b0896b33759e333e78f..5b533672a986955f71a60cdefacde7394e2b47bf 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,3 +1,14 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 2.4)
+#MARK_AS_ADVANCED( FORCE CMAKE_BACKWARDS_COMPATIBILITY )
+
+# for CMake 2.6 corrected behaviour (see "cmake --help-policy CMP0003")
+IF(COMMAND cmake_policy AND ${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} GREATER 4)
+  CMAKE_POLICY(SET CMP0003 NEW)
+  CMAKE_POLICY(SET CMP0005 NEW)
+ENDIF(COMMAND cmake_policy AND ${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} GREATER 4)
+
+
+
 PROJECT(crea)
 
 INCLUDE(Version.cmake)

diff --git a/cmake/CREAMacro_InstallLibraryForCMake.cmake b/cmake/CREAMacro_InstallLibraryForCMake.cmake
index 2bd7e0db3c76fcb721b492fa538b1c71ff417806..12a434eadea5e7353ff99157c613ac819420b65c 100644 (file)
--- a/cmake/CREAMacro_InstallLibraryForCMake.cmake
+++ b/cmake/CREAMacro_InstallLibraryForCMake.cmake
@@ -270,15 +270,18 @@ 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(UNIX)
     SET(${LIBRARY_NAME1}_BUILD_TREE_RELATIVE_LIBRARY_PATHS 
-      ${EXECUTABLE_OUTPUT_REL_PATH})
+      ${CILFC_EXECUTABLE_OUTPUT_REL_PATH})
     SET(${LIBRARY_NAME1}_INSTALL_TREE_RELATIVE_LIBRARY_PATHS lib)
   ELSE(UNIX)
     SET(${LIBRARY_NAME1}_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_NAME1}_INSTALL_TREE_RELATIVE_LIBRARY_PATHS bin)
   ENDIF(UNIX)
   SET(${LIBRARY_NAME1}_INSTALL_TREE_RELATIVE_INCLUDE_PATHS include/${LIBRARY_NAME1})

diff --git a/install/CMakeLists.txt b/install/CMakeLists.txt
index fa78a47f8ec6150e0c59b62cdce92c78daef4bdc..8bce6d111e09d2e7301558a09bc99b426992eeff 100644 (file)
--- a/install/CMakeLists.txt
+++ b/install/CMakeLists.txt
@@ -21,11 +21,11 @@ SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_INCLUDE_PATHS src)
 
 IF(UNIX)
   SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_LIBRARY_PATHS 
-    ${EXECUTABLE_OUTPUT_REL_PATH})
+    .) # ${EXECUTABLE_OUTPUT_REL_PATH})
 ELSE(UNIX)
   SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_LIBRARY_PATHS 
-    ${EXECUTABLE_OUTPUT_REL_PATH}/Debug
-    ${EXECUTABLE_OUTPUT_REL_PATH}/Release)
+    Debug #${EXECUTABLE_OUTPUT_REL_PATH}/Debug
+    Release) #${EXECUTABLE_OUTPUT_REL_PATH}/Release)
 ENDIF(UNIX)
 
 SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_INCLUDE_PATHS include/crea)