diff --git a/cmake-fedora-flag_release.patch b/cmake-fedora-flag_release.patch index 4c03ff5..7b1ad64 100644 --- a/cmake-fedora-flag_release.patch +++ b/cmake-fedora-flag_release.patch @@ -1,7 +1,7 @@ -Index: cmake-3.14.0/Modules/Compiler/Absoft-Fortran.cmake +Index: cmake-3.17.0-rc1/Modules/Compiler/Absoft-Fortran.cmake =================================================================== ---- cmake-3.14.0.orig/Modules/Compiler/Absoft-Fortran.cmake -+++ cmake-3.14.0/Modules/Compiler/Absoft-Fortran.cmake +--- cmake-3.17.0-rc1.orig/Modules/Compiler/Absoft-Fortran.cmake ++++ cmake-3.17.0-rc1/Modules/Compiler/Absoft-Fortran.cmake @@ -1,7 +1,7 @@ string(APPEND CMAKE_Fortran_FLAGS_INIT " ") string(APPEND CMAKE_Fortran_FLAGS_DEBUG_INIT " -g") @@ -11,10 +11,10 @@ Index: cmake-3.14.0/Modules/Compiler/Absoft-Fortran.cmake string(APPEND CMAKE_Fortran_FLAGS_RELWITHDEBINFO_INIT " -O2 -g") set(CMAKE_Fortran_MODDIR_FLAG "-YMOD_OUT_DIR=") set(CMAKE_Fortran_MODPATH_FLAG "-p") -Index: cmake-3.14.0/Modules/Compiler/G95-Fortran.cmake +Index: cmake-3.17.0-rc1/Modules/Compiler/G95-Fortran.cmake =================================================================== ---- cmake-3.14.0.orig/Modules/Compiler/G95-Fortran.cmake -+++ cmake-3.14.0/Modules/Compiler/G95-Fortran.cmake +--- cmake-3.17.0-rc1.orig/Modules/Compiler/G95-Fortran.cmake ++++ cmake-3.17.0-rc1/Modules/Compiler/G95-Fortran.cmake @@ -1,7 +1,7 @@ string(APPEND CMAKE_Fortran_FLAGS_INIT " ") string(APPEND CMAKE_Fortran_FLAGS_DEBUG_INIT " -g") @@ -24,11 +24,11 @@ Index: cmake-3.14.0/Modules/Compiler/G95-Fortran.cmake string(APPEND CMAKE_Fortran_FLAGS_RELWITHDEBINFO_INIT " -O2 -g") set(CMAKE_Fortran_MODDIR_FLAG "-fmod=") set(CMAKE_Fortran_VERBOSE_FLAG "-v") -Index: cmake-3.14.0/Modules/Compiler/GNU.cmake +Index: cmake-3.17.0-rc1/Modules/Compiler/GNU.cmake =================================================================== ---- cmake-3.14.0.orig/Modules/Compiler/GNU.cmake -+++ cmake-3.14.0/Modules/Compiler/GNU.cmake -@@ -50,7 +50,7 @@ macro(__compiler_gnu lang) +--- cmake-3.17.0-rc1.orig/Modules/Compiler/GNU.cmake ++++ cmake-3.17.0-rc1/Modules/Compiler/GNU.cmake +@@ -55,7 +55,7 @@ macro(__compiler_gnu lang) string(APPEND CMAKE_${lang}_FLAGS_INIT " ") string(APPEND CMAKE_${lang}_FLAGS_DEBUG_INIT " -g") string(APPEND CMAKE_${lang}_FLAGS_MINSIZEREL_INIT " -Os -DNDEBUG") @@ -37,10 +37,10 @@ Index: cmake-3.14.0/Modules/Compiler/GNU.cmake string(APPEND CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT " -O2 -g -DNDEBUG") set(CMAKE_${lang}_CREATE_PREPROCESSED_SOURCE " -E > ") set(CMAKE_${lang}_CREATE_ASSEMBLY_SOURCE " -S -o ") -Index: cmake-3.14.0/Modules/Compiler/GNU-Fortran.cmake +Index: cmake-3.17.0-rc1/Modules/Compiler/GNU-Fortran.cmake =================================================================== ---- cmake-3.14.0.orig/Modules/Compiler/GNU-Fortran.cmake -+++ cmake-3.14.0/Modules/Compiler/GNU-Fortran.cmake +--- cmake-3.17.0-rc1.orig/Modules/Compiler/GNU-Fortran.cmake ++++ cmake-3.17.0-rc1/Modules/Compiler/GNU-Fortran.cmake @@ -14,7 +14,7 @@ set(CMAKE_Fortran_POSTPROCESS_FLAG "-fpr # No -DNDEBUG for Fortran. @@ -50,10 +50,10 @@ Index: cmake-3.14.0/Modules/Compiler/GNU-Fortran.cmake # No -isystem for Fortran because it will not find .mod files. unset(CMAKE_INCLUDE_SYSTEM_FLAG_Fortran) -Index: cmake-3.14.0/Modules/Compiler/Intel.cmake +Index: cmake-3.17.0-rc1/Modules/Compiler/Intel.cmake =================================================================== ---- cmake-3.14.0.orig/Modules/Compiler/Intel.cmake -+++ cmake-3.14.0/Modules/Compiler/Intel.cmake +--- cmake-3.17.0-rc1.orig/Modules/Compiler/Intel.cmake ++++ cmake-3.17.0-rc1/Modules/Compiler/Intel.cmake @@ -22,7 +22,7 @@ else() string(APPEND CMAKE_${lang}_FLAGS_INIT " ") string(APPEND CMAKE_${lang}_FLAGS_DEBUG_INIT " -g") @@ -63,11 +63,11 @@ Index: cmake-3.14.0/Modules/Compiler/Intel.cmake string(APPEND CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT " -O2 -g") set(CMAKE_${lang}_COMPILER_PREDEFINES_COMMAND "${CMAKE_${lang}_COMPILER}") -Index: cmake-3.14.0/Modules/Compiler/NVIDIA-CUDA.cmake +Index: cmake-3.17.0-rc1/Modules/Compiler/NVIDIA-CUDA.cmake =================================================================== ---- cmake-3.14.0.orig/Modules/Compiler/NVIDIA-CUDA.cmake -+++ cmake-3.14.0/Modules/Compiler/NVIDIA-CUDA.cmake -@@ -10,7 +10,7 @@ if(NOT "x${CMAKE_CUDA_SIMULATE_ID}" STRE +--- cmake-3.17.0-rc1.orig/Modules/Compiler/NVIDIA-CUDA.cmake ++++ cmake-3.17.0-rc1/Modules/Compiler/NVIDIA-CUDA.cmake +@@ -36,7 +36,7 @@ if(NOT "x${CMAKE_CUDA_SIMULATE_ID}" STRE set(CMAKE_SHARED_LIBRARY_CUDA_FLAGS -fPIC) string(APPEND CMAKE_CUDA_FLAGS_INIT " ") string(APPEND CMAKE_CUDA_FLAGS_DEBUG_INIT " -g") @@ -76,10 +76,10 @@ Index: cmake-3.14.0/Modules/Compiler/NVIDIA-CUDA.cmake string(APPEND CMAKE_CUDA_FLAGS_MINSIZEREL_INIT " -O1 -DNDEBUG") string(APPEND CMAKE_CUDA_FLAGS_RELWITHDEBINFO_INIT " -O2 -g -DNDEBUG") endif() -Index: cmake-3.14.0/Modules/Compiler/PathScale.cmake +Index: cmake-3.17.0-rc1/Modules/Compiler/PathScale.cmake =================================================================== ---- cmake-3.14.0.orig/Modules/Compiler/PathScale.cmake -+++ cmake-3.14.0/Modules/Compiler/PathScale.cmake +--- cmake-3.17.0-rc1.orig/Modules/Compiler/PathScale.cmake ++++ cmake-3.17.0-rc1/Modules/Compiler/PathScale.cmake @@ -16,6 +16,6 @@ macro(__compiler_pathscale lang) string(APPEND CMAKE_${lang}_FLAGS_INIT " ") string(APPEND CMAKE_${lang}_FLAGS_DEBUG_INIT " -g -O0") @@ -88,10 +88,10 @@ Index: cmake-3.14.0/Modules/Compiler/PathScale.cmake + string(APPEND CMAKE_${lang}_FLAGS_RELEASE_INIT " -O2") string(APPEND CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT " -g -O2") endmacro() -Index: cmake-3.14.0/Modules/Compiler/PGI.cmake +Index: cmake-3.17.0-rc1/Modules/Compiler/PGI.cmake =================================================================== ---- cmake-3.14.0.orig/Modules/Compiler/PGI.cmake -+++ cmake-3.14.0/Modules/Compiler/PGI.cmake +--- cmake-3.17.0-rc1.orig/Modules/Compiler/PGI.cmake ++++ cmake-3.17.0-rc1/Modules/Compiler/PGI.cmake @@ -18,7 +18,7 @@ macro(__compiler_pgi lang) string(APPEND CMAKE_${lang}_FLAGS_INIT " ") string(APPEND CMAKE_${lang}_FLAGS_DEBUG_INIT " -g -O0") @@ -101,10 +101,10 @@ Index: cmake-3.14.0/Modules/Compiler/PGI.cmake string(APPEND CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT " -O2 -gopt") if(CMAKE_HOST_WIN32) -Index: cmake-3.14.0/Modules/Compiler/SunPro-ASM.cmake +Index: cmake-3.17.0-rc1/Modules/Compiler/SunPro-ASM.cmake =================================================================== ---- cmake-3.14.0.orig/Modules/Compiler/SunPro-ASM.cmake -+++ cmake-3.14.0/Modules/Compiler/SunPro-ASM.cmake +--- cmake-3.17.0-rc1.orig/Modules/Compiler/SunPro-ASM.cmake ++++ cmake-3.17.0-rc1/Modules/Compiler/SunPro-ASM.cmake @@ -11,7 +11,7 @@ set(CMAKE_SHARED_LIBRARY_SONAME_ASM_FLAG string(APPEND CMAKE_ASM_FLAGS_INIT " ") string(APPEND CMAKE_ASM_FLAGS_DEBUG_INIT " -g") @@ -114,10 +114,10 @@ Index: cmake-3.14.0/Modules/Compiler/SunPro-ASM.cmake string(APPEND CMAKE_ASM_FLAGS_RELWITHDEBINFO_INIT " -g -xO2 -DNDEBUG") # Initialize ASM link type selection flags. These flags are used when -Index: cmake-3.14.0/Modules/Compiler/SunPro-C.cmake +Index: cmake-3.17.0-rc1/Modules/Compiler/SunPro-C.cmake =================================================================== ---- cmake-3.14.0.orig/Modules/Compiler/SunPro-C.cmake -+++ cmake-3.14.0/Modules/Compiler/SunPro-C.cmake +--- cmake-3.17.0-rc1.orig/Modules/Compiler/SunPro-C.cmake ++++ cmake-3.17.0-rc1/Modules/Compiler/SunPro-C.cmake @@ -19,7 +19,7 @@ set(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG " string(APPEND CMAKE_C_FLAGS_INIT " ") string(APPEND CMAKE_C_FLAGS_DEBUG_INIT " -g") @@ -127,10 +127,10 @@ Index: cmake-3.14.0/Modules/Compiler/SunPro-C.cmake string(APPEND CMAKE_C_FLAGS_RELWITHDEBINFO_INIT " -g -xO2 -DNDEBUG") set(CMAKE_DEPFILE_FLAGS_C "-xMD -xMF ") -Index: cmake-3.14.0/Modules/Compiler/SunPro-CXX.cmake +Index: cmake-3.17.0-rc1/Modules/Compiler/SunPro-CXX.cmake =================================================================== ---- cmake-3.14.0.orig/Modules/Compiler/SunPro-CXX.cmake -+++ cmake-3.14.0/Modules/Compiler/SunPro-CXX.cmake +--- cmake-3.17.0-rc1.orig/Modules/Compiler/SunPro-CXX.cmake ++++ cmake-3.17.0-rc1/Modules/Compiler/SunPro-CXX.cmake @@ -19,7 +19,7 @@ set(CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG string(APPEND CMAKE_CXX_FLAGS_INIT " ") string(APPEND CMAKE_CXX_FLAGS_DEBUG_INIT " -g") @@ -140,10 +140,10 @@ Index: cmake-3.14.0/Modules/Compiler/SunPro-CXX.cmake string(APPEND CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT " -g -xO2 -DNDEBUG") set(CMAKE_DEPFILE_FLAGS_CXX "-xMD -xMF ") -Index: cmake-3.14.0/Modules/Compiler/SunPro-Fortran.cmake +Index: cmake-3.17.0-rc1/Modules/Compiler/SunPro-Fortran.cmake =================================================================== ---- cmake-3.14.0.orig/Modules/Compiler/SunPro-Fortran.cmake -+++ cmake-3.14.0/Modules/Compiler/SunPro-Fortran.cmake +--- cmake-3.17.0-rc1.orig/Modules/Compiler/SunPro-Fortran.cmake ++++ cmake-3.17.0-rc1/Modules/Compiler/SunPro-Fortran.cmake @@ -17,7 +17,7 @@ set(CMAKE_EXECUTABLE_RUNTIME_Fortran_FLA string(APPEND CMAKE_Fortran_FLAGS_INIT " ") string(APPEND CMAKE_Fortran_FLAGS_DEBUG_INIT " -g") @@ -153,3 +153,16 @@ Index: cmake-3.14.0/Modules/Compiler/SunPro-Fortran.cmake string(APPEND CMAKE_Fortran_FLAGS_RELWITHDEBINFO_INIT " -g -xO2 -DNDEBUG") set(CMAKE_Fortran_MODDIR_FLAG "-moddir=") set(CMAKE_Fortran_MODPATH_FLAG "-M") +Index: cmake-3.17.0-rc1/Modules/Platform/Windows-Clang.cmake +=================================================================== +--- cmake-3.17.0-rc1.orig/Modules/Platform/Windows-Clang.cmake ++++ cmake-3.17.0-rc1/Modules/Platform/Windows-Clang.cmake +@@ -79,7 +79,7 @@ macro(__windows_compiler_clang_gnu lang) + + string(APPEND CMAKE_${lang}_FLAGS_DEBUG_INIT " -g -Xclang -gcodeview -O0 ${__ADDED_FLAGS_DEBUG}") + string(APPEND CMAKE_${lang}_FLAGS_MINSIZEREL_INIT " -Os -DNDEBUG ${__ADDED_FLAGS}") +- string(APPEND CMAKE_${lang}_FLAGS_RELEASE_INIT " -O3 -DNDEBUG ${__ADDED_FLAGS}") ++ string(APPEND CMAKE_${lang}_FLAGS_RELEASE_INIT " -O2 -DNDEBUG ${__ADDED_FLAGS}") + string(APPEND CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT " -O2 -g -DNDEBUG -Xclang -gcodeview ${__ADDED_FLAGS}") + endif() + set(CMAKE_INCLUDE_SYSTEM_FLAG_${lang} "-isystem ") diff --git a/cmake-findruby.patch b/cmake-findruby.patch index ec28253..b5d4fae 100644 --- a/cmake-findruby.patch +++ b/cmake-findruby.patch @@ -1,6 +1,7 @@ -diff -up cmake-3.15.3/Modules/FindRuby.cmake.orig cmake-3.15.3/Modules/FindRuby.cmake ---- cmake-3.15.3/Modules/FindRuby.cmake.orig 2019-09-30 22:18:24.213679271 -0600 -+++ cmake-3.15.3/Modules/FindRuby.cmake 2019-09-30 22:19:24.177961574 -0600 +Index: cmake-3.17.0-rc1/Modules/FindRuby.cmake +=================================================================== +--- cmake-3.17.0-rc1.orig/Modules/FindRuby.cmake ++++ cmake-3.17.0-rc1/Modules/FindRuby.cmake @@ -110,14 +110,8 @@ if(RUBY_EXECUTABLE AND NOT RUBY_VERSIO _RUBY_CONFIG_VAR("sitearchdir" RUBY_SITEARCH_DIR) _RUBY_CONFIG_VAR("sitelibdir" RUBY_SITELIB_DIR) diff --git a/cmake-mingw-dl.patch b/cmake-mingw-dl.patch index a83e378..ef24234 100644 --- a/cmake-mingw-dl.patch +++ b/cmake-mingw-dl.patch @@ -1,9 +1,13 @@ -Index: cmake-3.14.0/Modules/Platform/Windows-GNU.cmake +Index: cmake-3.17.0-rc1/Modules/Platform/Windows-GNU.cmake =================================================================== ---- cmake-3.14.0.orig/Modules/Platform/Windows-GNU.cmake -+++ cmake-3.14.0/Modules/Platform/Windows-GNU.cmake -@@ -28,9 +28,11 @@ if(MINGW) - set(CMAKE_FIND_LIBRARY_SUFFIXES ".dll" ".dll.a" ".a" ".lib") +--- cmake-3.17.0-rc1.orig/Modules/Platform/Windows-GNU.cmake ++++ cmake-3.17.0-rc1/Modules/Platform/Windows-GNU.cmake +@@ -25,12 +25,14 @@ endif() + + if(MINGW) + set(CMAKE_FIND_LIBRARY_PREFIXES "lib" "") +- set(CMAKE_FIND_LIBRARY_SUFFIXES ".dll.a" ".a" ".lib") ++ set(CMAKE_FIND_LIBRARY_SUFFIXES ".dll" ".dll.a" ".a" ".lib") set(CMAKE_C_STANDARD_LIBRARIES_INIT "-lkernel32 -luser32 -lgdi32 -lwinspool -lshell32 -lole32 -loleaut32 -luuid -lcomdlg32 -ladvapi32") set(CMAKE_CXX_STANDARD_LIBRARIES_INIT "${CMAKE_C_STANDARD_LIBRARIES_INIT}") + set(CMAKE_DL_LIBS "dl")