Changeset: 6c9151ba6c29 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/6c9151ba6c29
Modified Files:
CMakeLists.txt
Branch: Jan2022
Log Message:
Backed out changeset 861d6d5073c9.
It was tested, but not without no LD_LIBRARY_PATH. We'll have to come
up with a better solutions, and then not in this branch.
diffs (12 lines):
diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -88,7 +88,7 @@ monetdb_configure_misc()
# Some custom target will need these setting.
include(monetdb-custom-targets)
-if(NOT ${CMAKE_INSTALL_PREFIX} STREQUAL "/usr" AND NOT
${CPACK_PACKAGING_INSTALL_PREFIX} STREQUAL "/")
+if(NOT ${CMAKE_INSTALL_PREFIX} STREQUAL "/usr")
SET(CMAKE_SKIP_BUILD_RPATH FALSE)
SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_FULL_LIBDIR}")
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
