1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53
|
Index: scotch/src/CMakeLists.txt
===================================================================
--- scotch.orig/src/CMakeLists.txt 2025-10-04 13:42:19.431760592 +0200
+++ scotch/src/CMakeLists.txt 2025-10-04 13:42:19.427534128 +0200
@@ -47,7 +47,10 @@
############################################################
# Add general compiler options
-add_definitions(-Drestrict=__restrict -DSCOTCH_RENAME)
+add_definitions(-Drestrict=__restrict)
+if(SCOTCH_RENAME)
+ add_definitions(-DSCOTCH_RENAME)
+endif()
set(dev_null /dev/null)
@@ -71,7 +74,10 @@
# Manage suffixes
if (USE_SUFFIX)
- add_definitions(-DSCOTCH_RENAME_ALL -DSCOTCH_NAME_SUFFIX=${SCOTCH_NAME_SUFFIX})
+ add_definitions(-DSCOTCH_NAME_SUFFIX=${SCOTCH_NAME_SUFFIX})
+ if(SCOTCH_RENAME_ALL)
+ add_definitions(-DSCOTCH_RENAME_ALL)
+ endif()
endif()
###################
Index: scotch/CMakeLists.txt
===================================================================
--- scotch.orig/CMakeLists.txt 2025-10-04 13:42:19.431760592 +0200
+++ scotch/CMakeLists.txt 2025-10-04 13:42:19.428317523 +0200
@@ -69,6 +69,8 @@
set(SCOTCH_PATCHLEVEL 10)
set(SCOTCH_CODENAME "Sankara")
+include(CMakeDependentOption)
+
add_definitions(-DSCOTCH_VERSION_NUM=${SCOTCH_VERSION}
-DSCOTCH_RELEASE_NUM=${SCOTCH_RELEASE}
-DSCOTCH_PATCHLEVEL_NUM=${SCOTCH_PATCHLEVEL})
@@ -83,9 +85,8 @@
# Manage suffixes
set(SCOTCH_NAME_SUFFIX "" CACHE STRING "Suffix to add to every symbol in the Scotch/PT-Scotch libraries")
-if(NOT "${SCOTCH_NAME_SUFFIX}" STREQUAL "")
- set(USE_SUFFIX ON)
-endif()
+cmake_dependent_option(USE_SUFFIX "Apply suffix to API names" ON SCOTCH_NAME_SUFFIX OFF)
+
# Thread support
option(THREADS "Use multi-threading in Scotch and PT-Scotch" ON)
|