libogdf: fix libdir

This commit is contained in:
Đoàn Trần Công Danh 2021-04-03 17:38:16 +07:00
parent 37068870a9
commit 20f3b67af3

View file

@ -0,0 +1,32 @@
Index: OGDF-snapshot/cmake/coin.cmake
===================================================================
--- OGDF-snapshot.orig/cmake/coin.cmake
+++ OGDF-snapshot/cmake/coin.cmake
@@ -55,9 +55,9 @@ else()
endif()
# installation
-set(COIN_INSTALL_LIBRARY_DIR "lib/${CMAKE_LIBRARY_ARCHITECTURE}" CACHE PATH "Installation path of COIN library")
+set(COIN_INSTALL_LIBRARY_DIR "lib" CACHE PATH "Installation path of COIN library")
set(COIN_INSTALL_INCLUDE_DIR "include" CACHE PATH "Installation path of COIN header files (creates subdirectory)")
-set(COIN_INSTALL_CMAKE_DIR "lib/${CMAKE_LIBRARY_ARCHITECTURE}/cmake/OGDF/" CACHE PATH "Installation path of COIN files for CMake")
+set(COIN_INSTALL_CMAKE_DIR "lib/cmake/OGDF/" CACHE PATH "Installation path of COIN files for CMake")
mark_as_advanced(COIN_INSTALL_LIBRARY_DIR COIN_INSTALL_INCLUDE_DIR COIN_INSTALL_CMAKE_DIR)
install(TARGETS COIN
EXPORT CoinTargets
Index: OGDF-snapshot/cmake/ogdf.cmake
===================================================================
--- OGDF-snapshot.orig/cmake/ogdf.cmake
+++ OGDF-snapshot/cmake/ogdf.cmake
@@ -166,9 +166,9 @@ if(SHOW_STACKTRACE)
endif()
# installation
-set(OGDF_INSTALL_LIBRARY_DIR "lib/${CMAKE_LIBRARY_ARCHITECTURE}" CACHE PATH "Installation path of OGDF library")
+set(OGDF_INSTALL_LIBRARY_DIR "lib" CACHE PATH "Installation path of OGDF library")
set(OGDF_INSTALL_INCLUDE_DIR "include" CACHE PATH "Installation path of OGDF header files (creates subdirectory)")
-set(OGDF_INSTALL_CMAKE_DIR "lib/${CMAKE_LIBRARY_ARCHITECTURE}/cmake/OGDF/" CACHE PATH "Installation path of OGDF files for CMake")
+set(OGDF_INSTALL_CMAKE_DIR "lib/cmake/OGDF/" CACHE PATH "Installation path of OGDF files for CMake")
mark_as_advanced(OGDF_INSTALL_LIBRARY_DIR OGDF_INSTALL_INCLUDE_DIR OGDF_INSTALL_CMAKE_DIR)
configure_file(cmake/ogdf-config.cmake "${PROJECT_BINARY_DIR}/ogdf-config.cmake" @ONLY)
install(TARGETS OGDF