OSDN Git Service

install ld config regardless of RPATH preferences
authorIvailo Monev <xakepa10@gmail.com>
Tue, 3 May 2016 13:57:39 +0000 (13:57 +0000)
committerIvailo Monev <xakepa10@gmail.com>
Tue, 3 May 2016 13:57:39 +0000 (13:57 +0000)
some vendors may just change/remove the RPATH with external tool,
such as chrpath or scanelf, even tought there is a CMake option
for it

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
CMakeLists.txt

index b3fea20..eef8d90 100644 (file)
@@ -682,17 +682,15 @@ install(
 )
 
 if(NOT KATIE_PLATFORM MATCHES "(win32|wince|mac)")
-    if(CMAKE_SKIP_INSTALL_RPATH OR NOT CMAKE_INSTALL_RPATH)
-        configure_file(
-            ${CMAKE_SOURCE_DIR}/cmake/ld.so.conf.cmake
-            ${CMAKE_BINARY_DIR}/katie-${KATIE_ARCHITECTURE}.conf
-            @ONLY
-        )
-        install(
-            FILES ${CMAKE_BINARY_DIR}/katie-${KATIE_ARCHITECTURE}.conf
-            DESTINATION ${LDCONF_INSTALL_PATH_INST}
-        )
-    endif()
+    configure_file(
+        ${CMAKE_SOURCE_DIR}/cmake/ld.so.conf.cmake
+        ${CMAKE_BINARY_DIR}/katie-${KATIE_ARCHITECTURE}.conf
+        @ONLY
+    )
+    install(
+        FILES ${CMAKE_BINARY_DIR}/katie-${KATIE_ARCHITECTURE}.conf
+        DESTINATION ${LDCONF_INSTALL_PATH_INST}
+    )
 
     configure_file(
         ${CMAKE_SOURCE_DIR}/cmake/profile.sh.cmake