diff options
| -rw-r--r-- | CMakeLists.txt | 10 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 9 |
2 files changed, 10 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 14e6a507..16a745ab 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -395,6 +395,16 @@ else() set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/artifacts) endif() +# rpath +if(XCODE_BUILD) + set(CMAKE_MACOSX_RPATH TRUE) + set(CMAKE_INSTALL_RPATH "@executable_path/../Frameworks") +else() + set(CMAKE_SKIP_INSTALL_RPATH FALSE) + set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib") + set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) +endif() + if(BUILD_MODULES) include(${CMAKE_SOURCE_DIR}/cmake/ModuleRegistry.cmake) add_subdirectory(modules) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 2953e02f..26db1fee 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -77,15 +77,6 @@ else() set(RESOURCE_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) endif() -# rpath -if(XCODE_BUILD) - set(CMAKE_MACOSX_RPATH TRUE) - set(CMAKE_INSTALL_RPATH "@executable_path/../Frameworks") -else() - set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib") - set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) -endif() - if(MINGW) add_executable(${APP_NAME} WIN32 ${APP_SOURCE} ${RESOURCE_FILES}) elseif(XCODE_BUILD) |