From 3f9487ff221ac3583a5feb001511b96720e22f8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20M=C3=B6ller?= Date: Wed, 27 Aug 2014 12:39:29 +0000 Subject: [PATCH] fix cmake (>=3.0) warning on MacOS closes #2251 git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@1140 fdac6126-5c0c-442c-9429-916003d36597 --- cmake/ACGCommon.cmake | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/cmake/ACGCommon.cmake b/cmake/ACGCommon.cmake index 2c8502f3..c5e46f1b 100644 --- a/cmake/ACGCommon.cmake +++ b/cmake/ACGCommon.cmake @@ -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 (