diff options
| author | nicolas.dufresne <nicolas.dufresne@c587cffe-e639-0410-9787-d7902ae8ed56> | 2010-08-18 20:04:12 +0000 |
|---|---|---|
| committer | nicolas.dufresne <nicolas.dufresne@c587cffe-e639-0410-9787-d7902ae8ed56> | 2010-08-18 20:04:12 +0000 |
| commit | 955b6329d3db60e8e5ce5e48ec383a9ebd16967c (patch) | |
| tree | f48178236638f87f0da398d26b6bef2371b7daf9 /libproxy/cmake | |
| parent | e3d0f858481a58c9f0767fde7994e691d524d5d3 (diff) | |
| download | libproxy-955b6329d3db60e8e5ce5e48ec383a9ebd16967c.tar.gz | |
Fix relative path bug with LIBEXECDIR and MODULEDIR
git-svn-id: http://libproxy.googlecode.com/svn/trunk@719 c587cffe-e639-0410-9787-d7902ae8ed56
Diffstat (limited to 'libproxy/cmake')
| -rw-r--r-- | libproxy/cmake/libproxy.cmk | 8 | ||||
| -rw-r--r-- | libproxy/cmake/pxmodule.cmk | 9 |
2 files changed, 14 insertions, 3 deletions
diff --git a/libproxy/cmake/libproxy.cmk b/libproxy/cmake/libproxy.cmk index 2c2cfa9..5625d4e 100644 --- a/libproxy/cmake/libproxy.cmk +++ b/libproxy/cmake/libproxy.cmk @@ -9,8 +9,14 @@ if(WIN32) string(REGEX REPLACE "\\\\" "\\\\\\\\" MODULE_INSTALL_DIR ${MODULE_INSTALL_DIR}) endif() +if(IS_ABSOLUTE "${MODULE_INSTALL_DIR}") + set(MODULEDIR "${MODULE_INSTALL_DIR}") +else () + set(MODULEDIR "${CMAKE_INSTALL_PREFIX}/${MODULE_INSTALL_DIR}") +endif() + set_property(SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/proxy.cpp - PROPERTY COMPILE_DEFINITIONS MODULEDIR="${MODULE_INSTALL_DIR}";BUILTIN_MODULES=${BUILTIN_MODULES}) + PROPERTY COMPILE_DEFINITIONS MODULEDIR="${MODULEDIR}";BUILTIN_MODULES=${BUILTIN_MODULES}) set_target_properties(libproxy PROPERTIES PREFIX "" VERSION 1.0.0 SOVERSION 1) install(TARGETS libproxy DESTINATION ${LIB_INSTALL_DIR}) install(FILES proxy.h DESTINATION ${INCLUDE_INSTALL_DIR}) diff --git a/libproxy/cmake/pxmodule.cmk b/libproxy/cmake/pxmodule.cmk index bd7d49b..8b67b42 100644 --- a/libproxy/cmake/pxmodule.cmk +++ b/libproxy/cmake/pxmodule.cmk @@ -1,9 +1,14 @@ # Module function function(px_module name build builtin) + if(IS_ABSOLUTE "${LIBEXEC_INSTALL_DIR}") + set(LIBEXECDIR "${LIBEXEC_INSTALL_DIR}") + else () + set(LIBEXECDIR "${CMAKE_INSTALL_PREFIX}/${LIBEXEC_INSTALL_DIR}") + endif() if(build) if(builtin) set(built "*") - set_property(SOURCE modules/${name}.cpp PROPERTY COMPILE_DEFINITIONS LIBEXECDIR="${LIBEXEC_INSTALL_DIR}";MM_MODULE_BUILTIN=${name}) + set_property(SOURCE modules/${name}.cpp PROPERTY COMPILE_DEFINITIONS LIBEXECDIR="${LIBEXECDIR}";MM_MODULE_BUILTIN=${name}) set(LIBPROXY_SOURCES ${LIBPROXY_SOURCES} modules/${name}.cpp PARENT_SCOPE) set(BUILTIN_MODULES "${BUILTIN_MODULES} \"${name}\"," PARENT_SCOPE) if(${ARGC} GREATER 3) @@ -11,7 +16,7 @@ function(px_module name build builtin) endif() else() set(built "m") - set_property(SOURCE modules/${name}.cpp PROPERTY COMPILE_DEFINITIONS LIBEXECDIR="${LIBEXEC_INSTALL_DIR}") + set_property(SOURCE modules/${name}.cpp PROPERTY COMPILE_DEFINITIONS LIBEXECDIR="${LIBEXECDIR}") add_library(${name} MODULE modules/${name}.cpp) target_link_libraries(${name} libproxy) set_target_properties(${name} PROPERTIES PREFIX "") |