always-cautious/ortools-clone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make: Fix RPATH in [fz_]archive

Browse Source
This commit is contained in:
Corentin Le Molgat
2022-03-04 09:17:01 +01:00
parent c6c314c7c9
commit ffb5ea4dc3
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cmake/cpp.cmake
View File

@@ -319,7 +319,8 @@ function(add_cxx_sample FILE_NAME)
set(CMAKE_INSTALL_RPATH
"@loader_path/../${CMAKE_INSTALL_LIBDIR};@loader_path")
elseif(UNIX)
set(CMAKE_INSTALL_RPATH "$ORIGIN/../${CMAKE_INSTALL_LIBDIR}:$ORIGIN")
set(CMAKE_INSTALL_RPATH
"$ORIGIN/../${CMAKE_INSTALL_LIBDIR}:$ORIGIN/../lib64:$ORIGIN/../lib:$ORIGIN")
endif()
add_executable(${SAMPLE_NAME} ${FILE_NAME})
@@ -352,7 +353,7 @@ function(add_cxx_example FILE_NAME)
set(CMAKE_INSTALL_RPATH
"@loader_path/../${CMAKE_INSTALL_LIBDIR};@loader_path")
elseif(UNIX)
set(CMAKE_INSTALL_RPATH "$ORIGIN/../${CMAKE_INSTALL_LIBDIR}:$ORIGIN")
set(CMAKE_INSTALL_RPATH "$ORIGIN/../${CMAKE_INSTALL_LIBDIR}:$ORIGIN/../lib64:$ORIGIN/../lib:$ORIGIN")
endif()
add_executable(${EXAMPLE_NAME} ${FILE_NAME})
@@ -385,7 +386,7 @@ function(add_cxx_test FILE_NAME)
set(CMAKE_INSTALL_RPATH
"@loader_path/../${CMAKE_INSTALL_LIBDIR};@loader_path")
elseif(UNIX)
set(CMAKE_INSTALL_RPATH "$ORIGIN/../${CMAKE_INSTALL_LIBDIR}:$ORIGIN")
set(CMAKE_INSTALL_RPATH "$ORIGIN/../${CMAKE_INSTALL_LIBDIR}:$ORIGIN/../lib64:$ORIGIN/../lib:$ORIGIN")
endif()
add_executable(${TEST_NAME} ${FILE_NAME})

2
cmake/flatzinc.cmake
View File

@@ -105,7 +105,7 @@ if(APPLE)
set(CMAKE_INSTALL_RPATH
"@loader_path/../${CMAKE_INSTALL_LIBDIR};@loader_path")
elseif(UNIX)
set(CMAKE_INSTALL_RPATH "$ORIGIN/../${CMAKE_INSTALL_LIBDIR}:$ORIGIN")
set(CMAKE_INSTALL_RPATH "$ORIGIN/../${CMAKE_INSTALL_LIBDIR}:$ORIGIN/../lib64:$ORIGIN/../lib:$ORIGIN")
endif()

2
makefiles/Makefile.archive.mk
View File

@@ -263,6 +263,7 @@ test_archive: $(INSTALL_DIR)$(ARCHIVE_EXT)
ifeq ($(SYSTEM),win)
$(UNZIP) $< -d $(TEMP_TEST_DIR)
cd $(TEMP_TEST_DIR)$S$(INSTALL_DIR) \
&& $(MAKE) MAKEFLAGS= \
&& $(MAKE) MAKEFLAGS= test_cc \
&& $(MAKE) MAKEFLAGS= test_java \
&& $(MAKE) MAKEFLAGS= test_dotnet
@@ -271,6 +272,7 @@ else
$(RENAME) lib lib2
$(TAR) -xvf $< -C $(TEMP_TEST_DIR)
( cd $(TEMP_TEST_DIR)$S$(INSTALL_DIR) \
&& $(MAKE) MAKEFLAGS= \
&& $(MAKE) MAKEFLAGS= test_cc \
&& $(MAKE) MAKEFLAGS= test_java \
&& $(MAKE) MAKEFLAGS= test_dotnet \