diff --git a/cmake/ACGCommon.cmake b/cmake/ACGCommon.cmake index 5a98944c..f5b466ed 100644 --- a/cmake/ACGCommon.cmake +++ b/cmake/ACGCommon.cmake @@ -76,14 +76,14 @@ if (WIN32) endif () elseif (APPLE) 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 (ACG_PROJECT_PLUGINDIR "lib/${CMAKE_PROJECT_NAME}/plugins") + set (ACG_PROJECT_PLUGINDIR "${ACG_PROJECT_LIBDIR}/plugins") set (ACG_PROJECT_BINDIR "bin") else () set (ACG_PROJECT_DATADIR "share/${CMAKE_PROJECT_NAME}") - set (ACG_PROJECT_LIBDIR "lib/${CMAKE_PROJECT_NAME}") - set (ACG_PROJECT_PLUGINDIR "lib/${CMAKE_PROJECT_NAME}/plugins") + set (ACG_PROJECT_LIBDIR "lib${LIB_SUFFIX}") + set (ACG_PROJECT_PLUGINDIR "${ACG_PROJECT_LIBDIR}/plugins") set (ACG_PROJECT_BINDIR "bin") endif () @@ -118,7 +118,7 @@ macro (acg_set_target_props target) set_target_properties ( ${target} PROPERTIES #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 SKIP_BUILD_RPATH 0 ) @@ -126,7 +126,7 @@ macro (acg_set_target_props target) set_target_properties ( ${target} PROPERTIES - INSTALL_RPATH "$ORIGIN/../lib/${CMAKE_PROJECT_NAME}" + INSTALL_RPATH "$ORIGIN/../${ACG_PROJECT_LIBDIR}" BUILD_WITH_INSTALL_RPATH 1 SKIP_BUILD_RPATH 0 RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/Build/${ACG_PROJECT_BINDIR}"