Skip to content

Commit

Permalink
fix cmake (>=3.0) warning on MacOS
Browse files Browse the repository at this point in the history
closes #2251
  • Loading branch information
moeller committed Aug 27, 2014
1 parent 8a01bf0 commit 93a2f81
Showing 1 changed file with 16 additions and 6 deletions.
22 changes: 16 additions & 6 deletions cmake/ACGCommon.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -127,12 +127,22 @@ 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/../${ACG_PROJECT_LIBDIR}"
BUILD_WITH_INSTALL_RPATH 1
SKIP_BUILD_RPATH 0
)
if (CMAKE_MAJOR_VERSION >= 3)
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()
set_target_properties (
${target} PROPERTIES
INSTALL_NAME_DIR "@executable_path/../${ACG_PROJECT_LIBDIR}"
BUILD_WITH_INSTALL_RPATH 1
SKIP_BUILD_RPATH 0
)
endif(CMAKE_MAJOR_VERSION >= 3)
elseif (NOT APPLE)

set_target_properties (
Expand Down

0 comments on commit 93a2f81

Please sign in to comment.