diff --git a/CMakeLists.txt b/CMakeLists.txt index a84492624..4d2e067a8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -45,12 +45,6 @@ if(WIN32) # subdirs add_subdirectory(src/lib_spark) else() - # make sparkd look for libspark.so in its directory - set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) - set(CMAKE_INSTALL_RPATH ".") - set(CMAKE_INSTALL_PREFIX "${CMAKE_SOURCE_DIR}/install") - set(SPARK_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/$") - if(BUILD_SPARKD) # Note: All macros that begin w/ 'CCAPI' are ccapi's macros (defined and/or # read by their code). We override some below. diff --git a/CMakePresets.json b/CMakePresets.json index 77e5e237e..b336d4783 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -49,12 +49,8 @@ "binaryDir": "${sourceDir}/build/${presetName}", "cacheVariables": { "platform": "", - "CMAKE_BUILD_WITH_INSTALL_RPATH": { - "type": "BOOL", - "value": "ON" - }, "CMAKE_CXX_STANDARD": "20", - "CMAKE_INSTALL_RPATH": ".", + "CMAKE_INSTALL_PREFIX": "${sourceDir}/install/${presetName}", "CMAKE_PREFIX_PATH": "${sourceDir}/cmake/;${sourceDir}/.venv/lib/python3.10/site-packages/pybind11/share/cmake/pybind11", "CMAKE_EXE_LINKER_FLAGS": "-Wno-undef", "EXTERNALS_ROOT": "${sourceDir}/externals/linux",