Update 0002-cmake-set-SUFFIX64.patch

mmuetzel · Jan 26, 2022 · 6c4787f · 6c4787f
1 parent 2e36c8d
commit 6c4787f
Showing 1 changed file with 8 additions and 14 deletions.
diff --git a/mingw-w64-arpack/0002-cmake-set-SUFFIX64.patch b/mingw-w64-arpack/0002-cmake-set-SUFFIX64.patch
@@ -1,6 +1,6 @@
 diff -urN arpack-ng-3.8.0_orig/CMakeLists.txt arpack-ng-3.8.0/CMakeLists.txt
 --- arpack-ng-3.8.0_orig/CMakeLists.txt	2020-12-07 11:40:45.000000000 +0100
-+++ arpack-ng-3.8.0/CMakeLists.txt	2022-01-26 13:38:30.619004400 +0100
++++ arpack-ng-3.8.0/CMakeLists.txt	2022-01-26 15:57:48.117487300 +0100
 @@ -678,6 +678,10 @@
  # 'make install' to the correct location
  include(GNUInstallDirs)
@@ -12,15 +12,7 @@ diff -urN arpack-ng-3.8.0_orig/CMakeLists.txt arpack-ng-3.8.0/CMakeLists.txt
  # Convert variable names to those expected by the .pc file.
  set(prefix ${CMAKE_INSTALL_PREFIX})
  set(exec_prefix \${prefix})
-@@ -709,7 +713,6 @@
- configure_file(PARPACK/SRC/MPI/parpack.pc.in "${PROJECT_BINARY_DIR}/PARPACK/SRC/MPI/parpack${LIBSUFFIX}.pc" @ONLY)
- configure_file(EXAMPLES/MATRIX_MARKET/arpackSolver.pc.in "${PROJECT_BINARY_DIR}/EXAMPLES/MATRIX_MARKET/arpackSolver.pc" @ONLY)
-
--
- install(TARGETS arpack
-     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-@@ -727,41 +730,41 @@
+@@ -727,41 +731,41 @@
  endif ()
 
  if(ICB)
@@ -88,13 +80,15 @@ diff -urN arpack-ng-3.8.0_orig/SRC/arpack.pc.in arpack-ng-3.8.0/SRC/arpack.pc.in
 +Cflags: -I${includedir}/arpack@SUFFIX64@
 diff -urN arpack-ng-3.8.0_orig/arpack-ng-config.cmake.in arpack-ng-3.8.0/arpack-ng-config.cmake.in
 --- arpack-ng-3.8.0_orig/arpack-ng-config.cmake.in	2020-12-07 11:40:45.000000000 +0100
-+++ arpack-ng-3.8.0/arpack-ng-config.cmake.in	2022-01-24 09:38:46.168679800 +0100
++++ arpack-ng-3.8.0/arpack-ng-config.cmake.in	2022-01-26 15:56:50.035370300 +0100
 @@ -19,7 +19,7 @@
 
  # Create arpack targets.
  add_library(ARPACK::ARPACK INTERFACE IMPORTED)
 -set_target_properties(ARPACK::ARPACK PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${includedir}/arpack")
-+set_target_properties(ARPACK::ARPACK PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${includedir}/arpack${SUFFIX64}")
- set_target_properties(ARPACK::ARPACK PROPERTIES INTERFACE_LINK_LIBRARIES      "arpack")
+-set_target_properties(ARPACK::ARPACK PROPERTIES INTERFACE_LINK_LIBRARIES      "arpack")
++set_target_properties(ARPACK::ARPACK PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${includedir}/arpack@SUFFIX64@")
++set_target_properties(ARPACK::ARPACK PROPERTIES INTERFACE_LINK_LIBRARIES      "arpack@LIBSUFFIX@")
  add_library(PARPACK::PARPACK INTERFACE IMPORTED)
- set_target_properties(PARPACK::PARPACK PROPERTIES INTERFACE_LINK_LIBRARIES    "parpack")
+-set_target_properties(PARPACK::PARPACK PROPERTIES INTERFACE_LINK_LIBRARIES    "parpack")
++set_target_properties(PARPACK::PARPACK PROPERTIES INTERFACE_LINK_LIBRARIES    "parpack@LIBSUFFIX@")