Pixyco-XYZ/openmesh
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- add LIB_SUFFIX variable

Browse Source 
- reduces dir depth for libraries

closes #2257

git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@1138 fdac6126-5c0c-442c-9429-916003d36597
This commit is contained in:
Matthias Möller
2014-08-27 10:09:29 +00:00
parent d633dfc737
commit b3da549ddf
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cmake/ACGCommon.cmake
View File

@@ -76,14 +76,14 @@ if (WIN32)
endif () endif ()
elseif (APPLE) elseif (APPLE)
set (ACG_PROJECT_DATADIR "share/${CMAKE_PROJECT_NAME}") set (ACG_PROJECT_DATADIR "share/${CMAKE_PROJECT_NAME}")
set (ACG_PROJECT_LIBDIR "lib/${CMAKE_PROJECT_NAME}") set (ACG_PROJECT_LIBDIR "lib${LIB_SUFFIX}")
set (CMAKE_LIBRARY_OUTPUT_DIR "${CMAKE_BINARY_DIR}/Build/${ACG_PROJECT_LIBDIR}") set (CMAKE_LIBRARY_OUTPUT_DIR "${CMAKE_BINARY_DIR}/Build/${ACG_PROJECT_LIBDIR}")
set (ACG_PROJECT_PLUGINDIR "lib/${CMAKE_PROJECT_NAME}/plugins") set (ACG_PROJECT_PLUGINDIR "${ACG_PROJECT_LIBDIR}/plugins")
set (ACG_PROJECT_BINDIR "bin") set (ACG_PROJECT_BINDIR "bin")
else () else ()
set (ACG_PROJECT_DATADIR "share/${CMAKE_PROJECT_NAME}") set (ACG_PROJECT_DATADIR "share/${CMAKE_PROJECT_NAME}")
set (ACG_PROJECT_LIBDIR "lib/${CMAKE_PROJECT_NAME}") set (ACG_PROJECT_LIBDIR "lib${LIB_SUFFIX}")
set (ACG_PROJECT_PLUGINDIR "lib/${CMAKE_PROJECT_NAME}/plugins") set (ACG_PROJECT_PLUGINDIR "${ACG_PROJECT_LIBDIR}/plugins")
set (ACG_PROJECT_BINDIR "bin") set (ACG_PROJECT_BINDIR "bin")
endif () endif ()
@@ -118,7 +118,7 @@ macro (acg_set_target_props target)
set_target_properties ( set_target_properties (
${target} PROPERTIES ${target} PROPERTIES
#INSTALL_NAME_DIR "@executable_path/../lib/${CMAKE_PROJECT_NAME}" #INSTALL_NAME_DIR "@executable_path/../lib/${CMAKE_PROJECT_NAME}"
INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib/${CMAKE_PROJECT_NAME}" INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/${ACG_PROJECT_LIBDIR}"
# BUILD_WITH_INSTALL_RPATH 1 # BUILD_WITH_INSTALL_RPATH 1
SKIP_BUILD_RPATH 0 SKIP_BUILD_RPATH 0
) )
@@ -126,7 +126,7 @@ macro (acg_set_target_props target)
set_target_properties ( set_target_properties (
${target} PROPERTIES ${target} PROPERTIES
INSTALL_RPATH "$ORIGIN/../lib/${CMAKE_PROJECT_NAME}" INSTALL_RPATH "$ORIGIN/../${ACG_PROJECT_LIBDIR}"
BUILD_WITH_INSTALL_RPATH 1 BUILD_WITH_INSTALL_RPATH 1
SKIP_BUILD_RPATH 0 SKIP_BUILD_RPATH 0
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/Build/${ACG_PROJECT_BINDIR}" RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/Build/${ACG_PROJECT_BINDIR}"