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

fix cmake (>=3.0) warning on MacOS

Browse Source 
closes #2251

git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@1140 fdac6126-5c0c-442c-9429-916003d36597
This commit is contained in:
Matthias Möller
2014-08-27 12:39:29 +00:00
parent ab54d4030d
commit 3f9487ff22
1 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
cmake/ACGCommon.cmake
View File

@@ -115,13 +115,24 @@ macro (acg_set_target_props target)
SKIP_BUILD_RPATH 0
)
elseif (APPLE AND NOT ACG_PROJECT_MACOS_BUNDLE)
set_target_properties (
${target} PROPERTIES
#INSTALL_NAME_DIR "@executable_path/../lib/${CMAKE_PROJECT_NAME}"
INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/${ACG_PROJECT_LIBDIR}"
# BUILD_WITH_INSTALL_RPATH 1
SKIP_BUILD_RPATH 0
)
if (NOT (CMAKE_MAJOR_VERSION LESS 3) )
# save rpath
set_target_properties (
${target} PROPERTIES
INSTALL_RPATH "@executable_path/../${ACG_PROJECT_LIBDIR}"
MACOSX_RPATH 1
#BUILD_WITH_INSTALL_RPATH 1
SKIP_BUILD_RPATH 0
)
else()
# save rpath via install name dir
set_target_properties (
${target} PROPERTIES
INSTALL_NAME_DIR "@executable_path/../${ACG_PROJECT_LIBDIR}"
#BUILD_WITH_INSTALL_RPATH 1
SKIP_BUILD_RPATH 0
)
endif(NOT (CMAKE_MAJOR_VERSION LESS 3))
elseif (NOT APPLE)
set_target_properties (