Skip to content
Snippets Groups Projects
Commit 1391ee69 authored by vahrenkamp's avatar vahrenkamp
Browse files

second fix with absolute paths in cmake config setup

git-svn-id: http://svn.code.sf.net/p/simox/code/trunk@730 042f3d55-54a8-47e9-b7fb-15903f145c44
parent e0513929
No related branches found
No related tags found
No related merge requests found
......@@ -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}")
......
......@@ -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(
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment