diff options
Diffstat (limited to 'sci-libs/libgeodecomp/files/libgeodecomp-0.4.0-scotch.patch')
| -rw-r--r-- | sci-libs/libgeodecomp/files/libgeodecomp-0.4.0-scotch.patch | 163 |
1 files changed, 163 insertions, 0 deletions
diff --git a/sci-libs/libgeodecomp/files/libgeodecomp-0.4.0-scotch.patch b/sci-libs/libgeodecomp/files/libgeodecomp-0.4.0-scotch.patch new file mode 100644 index 000000000000..774293f34c4a --- /dev/null +++ b/sci-libs/libgeodecomp/files/libgeodecomp-0.4.0-scotch.patch @@ -0,0 +1,163 @@ +diff --git a/CMakeModules/FindSCOTCH.cmake b/CMakeModules/FindSCOTCH.cmake +index 9f22b8d..0755470 100644 +--- a/CMakeModules/FindSCOTCH.cmake ++++ b/CMakeModules/FindSCOTCH.cmake +@@ -232,81 +232,83 @@ int main() { + ") + + message(STATUS "Performing test SCOTCH_TEST_RUNS") +- try_run( +- SCOTCH_TEST_LIB_EXITCODE +- SCOTCH_TEST_LIB_COMPILED +- ${CMAKE_CURRENT_BINARY_DIR} +- ${SCOTCH_TEST_LIB_CPP} +- CMAKE_FLAGS +- "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}" +- "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}" +- COMPILE_OUTPUT_VARIABLE SCOTCH_TEST_LIB_COMPILE_OUTPUT +- RUN_OUTPUT_VARIABLE SCOTCH_TEST_LIB_OUTPUT +- ) +- +- if (SCOTCH_TEST_LIB_COMPILED AND SCOTCH_TEST_LIB_EXITCODE EQUAL 0) +- message(STATUS "Performing test SCOTCH_TEST_RUNS - Success") +- set(SCOTCH_TEST_RUNS TRUE) +- else() +- message(STATUS "Performing test SCOTCH_TEST_RUNS - Failed") +- if (SCOTCH_DEBUG) +- # Output some variables +- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " +- "SCOTCH_TEST_LIB_COMPILED = ${SCOTCH_TEST_LIB_COMPILED}") +- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " +- "SCOTCH_TEST_LIB_COMPILE_OUTPUT = ${SCOTCH_TEST_LIB_COMPILE_OUTPUT}") +- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " +- "SCOTCH_TEST_LIB_EXITCODE = ${SCOTCH_TEST_LIB_EXITCODE}") +- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " +- "SCOTCH_TEST_LIB_OUTPUT = ${SCOTCH_TEST_LIB_OUTPUT}") +- endif() +- endif() +- +- # If program does not run, try adding zlib library and test again +- if(NOT SCOTCH_TEST_RUNS) +- if (NOT ZLIB_FOUND) +- find_package(ZLIB) +- endif() +- +- if (ZLIB_INCLUDE_DIRS AND ZLIB_LIBRARIES) +- set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${ZLIB_INCLUDE_DIRS}) +- set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${ZLIB_LIBRARIES}) +- +- message(STATUS "Performing test SCOTCH_ZLIB_TEST_RUNS") +- try_run( +- SCOTCH_ZLIB_TEST_LIB_EXITCODE +- SCOTCH_ZLIB_TEST_LIB_COMPILED +- ${CMAKE_CURRENT_BINARY_DIR} +- ${SCOTCH_TEST_LIB_CPP} +- CMAKE_FLAGS +- "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}" +- "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}" +- COMPILE_OUTPUT_VARIABLE SCOTCH_ZLIB_TEST_LIB_COMPILE_OUTPUT +- RUN_OUTPUT_VARIABLE SCOTCH_ZLIB_TEST_LIB_OUTPUT +- ) +- +- # Add zlib flags if required and set test run to 'true' +- if (SCOTCH_ZLIB_TEST_LIB_COMPILED AND SCOTCH_ZLIB_TEST_LIB_EXITCODE EQUAL 0) +- message(STATUS "Performing test SCOTCH_ZLIB_TEST_RUNS - Success") +- set(SCOTCH_INCLUDE_DIRS ${SCOTCH_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS}) +- set(SCOTCH_LIBRARIES ${SCOTCH_LIBRARIES} ${ZLIB_LIBRARIES}) +- set(SCOTCH_TEST_RUNS TRUE) +- else() +- message(STATUS "Performing test SCOTCH_ZLIB_TEST_RUNS - Failed") +- if (SCOTCH_DEBUG) +- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " +- "SCOTCH_ZLIB_TEST_LIB_COMPILED = ${SCOTCH_ZLIB_TEST_LIB_COMPILED}") +- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " +- "SCOTCH_ZLIB_TEST_LIB_COMPILE_OUTPUT = ${SCOTCH_ZLIB_TEST_LIB_COMPILE_OUTPUT}") +- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " +- "SCOTCH_TEST_LIB_EXITCODE = ${SCOTCH_TEST_LIB_EXITCODE}") +- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " +- "SCOTCH_TEST_LIB_OUTPUT = ${SCOTCH_TEST_LIB_OUTPUT}") +- endif() +- endif() +- +- endif() +- endif() ++ set(SCOTCH_TEST_RUNS FALSE) ++ message(STATUS "Performing test SCOTCH_TEST_RUNS - Failed") ++ # try_run( ++ # SCOTCH_TEST_LIB_EXITCODE ++ # SCOTCH_TEST_LIB_COMPILED ++ # ${CMAKE_CURRENT_BINARY_DIR} ++ # ${SCOTCH_TEST_LIB_CPP} ++ # CMAKE_FLAGS ++ # "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}" ++ # "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}" ++ # COMPILE_OUTPUT_VARIABLE SCOTCH_TEST_LIB_COMPILE_OUTPUT ++ # RUN_OUTPUT_VARIABLE SCOTCH_TEST_LIB_OUTPUT ++ # ) ++ ++ # if (SCOTCH_TEST_LIB_COMPILED AND SCOTCH_TEST_LIB_EXITCODE EQUAL 0) ++ # message(STATUS "Performing test SCOTCH_TEST_RUNS - Success") ++ # set(SCOTCH_TEST_RUNS TRUE) ++ # else() ++ # message(STATUS "Performing test SCOTCH_TEST_RUNS - Failed") ++ # if (SCOTCH_DEBUG) ++ # # Output some variables ++ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " ++ # "SCOTCH_TEST_LIB_COMPILED = ${SCOTCH_TEST_LIB_COMPILED}") ++ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " ++ # "SCOTCH_TEST_LIB_COMPILE_OUTPUT = ${SCOTCH_TEST_LIB_COMPILE_OUTPUT}") ++ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " ++ # "SCOTCH_TEST_LIB_EXITCODE = ${SCOTCH_TEST_LIB_EXITCODE}") ++ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " ++ # "SCOTCH_TEST_LIB_OUTPUT = ${SCOTCH_TEST_LIB_OUTPUT}") ++ # endif() ++ # endif() ++ ++ # # If program does not run, try adding zlib library and test again ++ # if(NOT SCOTCH_TEST_RUNS) ++ # if (NOT ZLIB_FOUND) ++ # find_package(ZLIB) ++ # endif() ++ ++ # if (ZLIB_INCLUDE_DIRS AND ZLIB_LIBRARIES) ++ # set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${ZLIB_INCLUDE_DIRS}) ++ # set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${ZLIB_LIBRARIES}) ++ ++ # message(STATUS "Performing test SCOTCH_ZLIB_TEST_RUNS") ++ # try_run( ++ # SCOTCH_ZLIB_TEST_LIB_EXITCODE ++ # SCOTCH_ZLIB_TEST_LIB_COMPILED ++ # ${CMAKE_CURRENT_BINARY_DIR} ++ # ${SCOTCH_TEST_LIB_CPP} ++ # CMAKE_FLAGS ++ # "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}" ++ # "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}" ++ # COMPILE_OUTPUT_VARIABLE SCOTCH_ZLIB_TEST_LIB_COMPILE_OUTPUT ++ # RUN_OUTPUT_VARIABLE SCOTCH_ZLIB_TEST_LIB_OUTPUT ++ # ) ++ ++ # # Add zlib flags if required and set test run to 'true' ++ # if (SCOTCH_ZLIB_TEST_LIB_COMPILED AND SCOTCH_ZLIB_TEST_LIB_EXITCODE EQUAL 0) ++ # message(STATUS "Performing test SCOTCH_ZLIB_TEST_RUNS - Success") ++ # set(SCOTCH_INCLUDE_DIRS ${SCOTCH_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS}) ++ # set(SCOTCH_LIBRARIES ${SCOTCH_LIBRARIES} ${ZLIB_LIBRARIES}) ++ # set(SCOTCH_TEST_RUNS TRUE) ++ # else() ++ # message(STATUS "Performing test SCOTCH_ZLIB_TEST_RUNS - Failed") ++ # if (SCOTCH_DEBUG) ++ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " ++ # "SCOTCH_ZLIB_TEST_LIB_COMPILED = ${SCOTCH_ZLIB_TEST_LIB_COMPILED}") ++ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " ++ # "SCOTCH_ZLIB_TEST_LIB_COMPILE_OUTPUT = ${SCOTCH_ZLIB_TEST_LIB_COMPILE_OUTPUT}") ++ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " ++ # "SCOTCH_TEST_LIB_EXITCODE = ${SCOTCH_TEST_LIB_EXITCODE}") ++ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " ++ # "SCOTCH_TEST_LIB_OUTPUT = ${SCOTCH_TEST_LIB_OUTPUT}") ++ # endif() ++ # endif() ++ ++ # endif() ++ # endif() + endif() + endif() + |