diff --git a/CMakeLists.txt b/CMakeLists.txt index 7f5ef0730520cb21f1c276a892f0f08451dabd50..c0d6af1b052462b1d23f444741a8d2333d4222c1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -88,19 +88,10 @@ configure_file(CMakeModules/SimoxBuildTreeSettings.cmake.in MESSAGE ("INSTALL_CMAKE_DIR:${INSTALL_CMAKE_DIR}") # ... for the install tree -#file(RELATIVE_PATH RELATIVE_INSTALL_DIR -# "${CMAKE_INSTALL_PREFIX}/${INSTALL_CMAKE_DIR}" -# "${CMAKE_INSTALL_PREFIX}") -# INSTALL_CMAKE_DIR is already absolute file(RELATIVE_PATH RELATIVE_INSTALL_DIR - "${INSTALL_CMAKE_DIR}" + "${CMAKE_INSTALL_PREFIX}/${INSTALL_CMAKE_DIR}" "${CMAKE_INSTALL_PREFIX}") -#MESSAGE ("RELATIVE_PATH:${RELATIVE_PATH}") -#MESSAGE ("RELATIVE_INSTALL_DIR:${RELATIVE_INSTALL_DIR}") -#MESSAGE ("CMAKE_INSTALL_PREFIX:${CMAKE_INSTALL_PREFIX}") -#MESSAGE ("INSTALL_CMAKE_DIR:${INSTALL_CMAKE_DIR}") - set(CONF_INCLUDE_DIRS "${INSTALL_INCLUDE_DIR}") set(Simox_DATA_PATH "${Simox_INSTALL_DATA_DIR}") set(Simox_MACROS_INCLUDE_DIR "\${Simox_CMAKE_DIR}") diff --git a/config.cmake b/config.cmake index fd8d3427eeea868349a144a4ef69b88524b46c4f..52d8dc828c6b3ebbdcc10ed785c496878691c4d6 100644 --- a/config.cmake +++ b/config.cmake @@ -30,13 +30,14 @@ IF (NOT Simox_CONFIGURED) set(INSTALL_CMAKE_DIR ${DEF_INSTALL_CMAKE_DIR} CACHE PATH "Installation directory for CMake files") - # Make relative paths absolute (needed later on) - foreach(p LIB BIN INCLUDE CMAKE) - set(var INSTALL_${p}_DIR) - if(NOT IS_ABSOLUTE "${${var}}") - set(${var} "${CMAKE_INSTALL_PREFIX}/${${var}}") - endif() - endforeach() + # Make relative paths absolute (needed later on) + # -> disabled this since it produced lots of problems with generation of SimoxCOnfig.cmake + #foreach(p LIB BIN INCLUDE CMAKE) + # set(var INSTALL_${p}_DIR) + # if(NOT IS_ABSOLUTE "${${var}}") + # set(${var} "${CMAKE_INSTALL_PREFIX}/${${var}}") + # endif() + #endforeach() # set up include-directories include_directories(