cmake.patch 3.6 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677787980818283848586878889909192939495969798
  1. diff --git a/CMakeLists.txt b/CMakeLists.txt
  2. index ce3c5ba..b05667f 100644
  3. --- a/CMakeLists.txt
  4. +++ b/CMakeLists.txt
  5. @@ -42,7 +42,7 @@
  6. ############################################################
  7. cmake_minimum_required(VERSION 3.10)
  8. -project(SCOTCH LANGUAGES C Fortran)
  9. +project(SCOTCH LANGUAGES C)
  10. # Add module directory
  11. list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/Modules)
  12. diff --git a/src/esmumps/CMakeLists.txt b/src/esmumps/CMakeLists.txt
  13. index 7d2fb92..fa2ca12 100644
  14. --- a/src/esmumps/CMakeLists.txt
  15. +++ b/src/esmumps/CMakeLists.txt
  16. @@ -135,6 +135,7 @@ install(TARGETS esmumps
  17. EXPORT esmumpsTargets
  18. ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
  19. LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
  20. + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
  21. PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
  22. # Dummy PTEsMUMPS library file
  23. @@ -169,4 +170,5 @@ install(TARGETS ptesmumps
  24. EXPORT ptesmumpsTargets
  25. ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
  26. LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
  27. + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
  28. PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
  29. diff --git a/src/libscotch/CMakeLists.txt b/src/libscotch/CMakeLists.txt
  30. index f314d3a..e539ab9 100644
  31. --- a/src/libscotch/CMakeLists.txt
  32. +++ b/src/libscotch/CMakeLists.txt
  33. @@ -359,7 +359,7 @@ set(SCOTCH_C_SOURCES
  34. library_context_graph_f.c
  35. library_context_f.c
  36. #library_errcom.c
  37. - #library_error.c
  38. + library_error.c
  39. #library_error_exit.c
  40. library_f.h
  41. library_geom.c
  42. @@ -833,6 +833,7 @@ foreach(_target ${TARGETS_LIST})
  43. EXPORT ${_target}Targets
  44. ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
  45. LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
  46. + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
  47. PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
  48. if (BUILD_PTSCOTCH)
  49. @@ -847,6 +848,7 @@ foreach(_target ${TARGETS_LIST})
  50. EXPORT pt${_target}Targets
  51. ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
  52. LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
  53. + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
  54. PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
  55. endif()
  56. diff --git a/src/libscotchmetis/CMakeLists.txt b/src/libscotchmetis/CMakeLists.txt
  57. index e08fe6a..ac8b089 100644
  58. --- a/src/libscotchmetis/CMakeLists.txt
  59. +++ b/src/libscotchmetis/CMakeLists.txt
  60. @@ -127,13 +127,15 @@ foreach(version 3 5)
  61. EXPORT scotchmetisTargets
  62. ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
  63. LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
  64. + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
  65. PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
  66. else()
  67. install(TARGETS scotchmetisv${version}
  68. COMPONENT libscotch
  69. EXPORT scotchmetisTargets
  70. ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
  71. - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
  72. + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
  73. + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
  74. endif()
  75. endforeach(version 3 5)
  76. @@ -204,13 +206,15 @@ if(BUILD_PTSCOTCH)
  77. EXPORT ptscotchparmetisTargets
  78. ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
  79. LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
  80. + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
  81. PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
  82. else()
  83. install(TARGETS ptscotchparmetisv${version}
  84. COMPONENT libptscotch
  85. EXPORT ptscotchparmetisTargets
  86. ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
  87. - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
  88. + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
  89. + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
  90. endif()
  91. endforeach(version 3)
  92. endif(BUILD_PTSCOTCH)