Clean up rpath for OSX in CMake

Author: redhatrises

.travis.yml

@@ -8,7 +8,7 @@ compiler:
   - gcc
 
 env:
-  - PATH="/usr/local/opt/qt:/usr/local/opt/qt/bin:$PATH"
+  - PATH="/usr/local/opt/qt/bin:$PATH"
 
 before_install:
   - brew update
@@ -27,7 +27,7 @@ before_script:
 script:
   - ./build-for-osx.sh
   - wget `curl -s https://api.github.com/repos/openscap/scap-security-guide/releases/latest?access_token=$GITHUB_TOKEN | jq -r ".assets[] | select(.name | test(\"(scap-security-guide-[0-9].[0-9].[0-9]*).zip\")) | .browser_download_url"` -O ssg.zip
-  - mkdir -p `pwd`/scap-workbench.app/Contents/Resources/ssg/ && unzip ssg.zip -d `pwd`/scap-workbench.app/Contents/Resources/ssg/
+  - mkdir -p `pwd`/build-osx/scap-workbench.app/Contents/Resources/ssg/ && unzip ssg.zip && cp -a scap-security-guide-*/* `pwd`/build-osx/scap-workbench.app/Contents/Resources/ssg/
   - cd build-osx && sh osx-create-dmg.sh
 
 deploy:

CMakeLists.txt

@@ -127,24 +127,23 @@ set(SCAP_WORKBENCH_LINK_LIBRARIES
 
 # ---------- RPATHS for linking
 
-# see https://cmake.org/Wiki/CMake_RPATH_handling
+# see https://gitlab.kitware.com/cmake/community/wikis/doc/cmake/RPATH-handling
 
-# use, i.e. don't skip the full RPATH for the build tree
-set(CMAKE_SKIP_BUILD_RPATH FALSE)
-
-# when building, don't use the install RPATH already
-# (but later on when installing)
-set(CMAKE_BUILD_WITH_INSTALL_RPATH ON)
+if (APPLE)
+    # when building, use the install RPATH
+    # (but later on when installing)
+    set(CMAKE_BUILD_WITH_INSTALL_RPATH ON)
 
-set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_FULL_LIBDIR})
+    set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_FULL_LIBDIR})
 
-# add the automatically determined parts of the RPATH
-# which point to directories outside the build tree to the install RPATH
-set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+    # add the automatically determined parts of the RPATH
+    # which point to directories outside the build tree to the install RPATH
+    set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 
-# Turn on RPATH for OSX for policy warning
-set(CMAKE_MACOSX_RPATH ON)
-# ---------- CONFIGURATION
+    # Turn on RPATH for OSX for policy warning
+    set(CMAKE_MACOSX_RPATH ON)
+    # ---------- CONFIGURATION
+endif()
 
 configure_file("include/Config.h.in" "${CMAKE_CURRENT_BINARY_DIR}/Config.h")
 # It is not trivial to make the resulting file executable :-(