packages/cmake
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!13 [cmake] update to cmake-3.17.2

Browse Source 
Merge pull request !13 from licihua/new1
This commit is contained in:
openeuler-ci-bot 2020-05-25 19:59:59 +08:00 committed by Gitee
commit fc2eb1c40f
6 changed files with 101 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
cmake-3.12.1.tar.gz
View File

Binary file not shown.

BIN
cmake-3.17.2.tar.gz Executable file
View File

Binary file not shown.

134
cmake-fedora-flag_release.patch
View File

@ -1,7 +1,7 @@
diff -up cmake-3.12.0/.fedora_flag_release.orig cmake-3.12.0/.fedora_flag_release Index: cmake-3.17.2/Modules/Compiler/Absoft-Fortran.cmake
diff -up cmake-3.12.0/Modules/Compiler/Absoft-Fortran.cmake.orig cmake-3.12.0/Modules/Compiler/Absoft-Fortran.cmake ===================================================================
--- cmake-3.12.0/Modules/Compiler/Absoft-Fortran.cmake.orig 2018-07-17 06:29:00.000000000 -0500 --- cmake-3.17.2.orig/Modules/Compiler/Absoft-Fortran.cmake
+++ cmake-3.12.0/Modules/Compiler/Absoft-Fortran.cmake 2018-07-27 08:51:37.486583595 -0500 +++ cmake-3.17.2/Modules/Compiler/Absoft-Fortran.cmake
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
string(APPEND CMAKE_Fortran_FLAGS_INIT " ") string(APPEND CMAKE_Fortran_FLAGS_INIT " ")
string(APPEND CMAKE_Fortran_FLAGS_DEBUG_INIT " -g") string(APPEND CMAKE_Fortran_FLAGS_DEBUG_INIT " -g")
@ -11,9 +11,10 @@ diff -up cmake-3.12.0/Modules/Compiler/Absoft-Fortran.cmake.orig cmake-3.12.0/Mo
string(APPEND CMAKE_Fortran_FLAGS_RELWITHDEBINFO_INIT " -O2 -g") string(APPEND CMAKE_Fortran_FLAGS_RELWITHDEBINFO_INIT " -O2 -g")
set(CMAKE_Fortran_MODDIR_FLAG "-YMOD_OUT_DIR=") set(CMAKE_Fortran_MODDIR_FLAG "-YMOD_OUT_DIR=")
set(CMAKE_Fortran_MODPATH_FLAG "-p") set(CMAKE_Fortran_MODPATH_FLAG "-p")
diff -up cmake-3.12.0/Modules/Compiler/G95-Fortran.cmake.orig cmake-3.12.0/Modules/Compiler/G95-Fortran.cmake Index: cmake-3.17.2/Modules/Compiler/G95-Fortran.cmake
--- cmake-3.12.0/Modules/Compiler/G95-Fortran.cmake.orig 2018-07-17 06:29:00.000000000 -0500 ===================================================================
+++ cmake-3.12.0/Modules/Compiler/G95-Fortran.cmake 2018-07-27 08:51:37.487583601 -0500 --- cmake-3.17.2.orig/Modules/Compiler/G95-Fortran.cmake
+++ cmake-3.17.2/Modules/Compiler/G95-Fortran.cmake
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
string(APPEND CMAKE_Fortran_FLAGS_INIT " ") string(APPEND CMAKE_Fortran_FLAGS_INIT " ")
string(APPEND CMAKE_Fortran_FLAGS_DEBUG_INIT " -g") string(APPEND CMAKE_Fortran_FLAGS_DEBUG_INIT " -g")
@ -23,10 +24,11 @@ diff -up cmake-3.12.0/Modules/Compiler/G95-Fortran.cmake.orig cmake-3.12.0/Modul
string(APPEND CMAKE_Fortran_FLAGS_RELWITHDEBINFO_INIT " -O2 -g") string(APPEND CMAKE_Fortran_FLAGS_RELWITHDEBINFO_INIT " -O2 -g")
set(CMAKE_Fortran_MODDIR_FLAG "-fmod=") set(CMAKE_Fortran_MODDIR_FLAG "-fmod=")
set(CMAKE_Fortran_VERBOSE_FLAG "-v") set(CMAKE_Fortran_VERBOSE_FLAG "-v")
diff -up cmake-3.12.0/Modules/Compiler/GNU.cmake.orig cmake-3.12.0/Modules/Compiler/GNU.cmake Index: cmake-3.17.2/Modules/Compiler/GNU.cmake
--- cmake-3.12.0/Modules/Compiler/GNU.cmake.orig 2018-07-17 06:29:00.000000000 -0500 ===================================================================
+++ cmake-3.12.0/Modules/Compiler/GNU.cmake 2018-07-27 08:51:37.488583607 -0500 --- cmake-3.17.2.orig/Modules/Compiler/GNU.cmake
@@ -40,7 +40,7 @@ macro(__compiler_gnu lang) +++ cmake-3.17.2/Modules/Compiler/GNU.cmake
@@ -55,7 +55,7 @@ macro(__compiler_gnu lang)
string(APPEND CMAKE_${lang}_FLAGS_INIT " ") string(APPEND CMAKE_${lang}_FLAGS_INIT " ")
string(APPEND CMAKE_${lang}_FLAGS_DEBUG_INIT " -g") string(APPEND CMAKE_${lang}_FLAGS_DEBUG_INIT " -g")
string(APPEND CMAKE_${lang}_FLAGS_MINSIZEREL_INIT " -Os -DNDEBUG") string(APPEND CMAKE_${lang}_FLAGS_MINSIZEREL_INIT " -Os -DNDEBUG")
@ -35,10 +37,11 @@ diff -up cmake-3.12.0/Modules/Compiler/GNU.cmake.orig cmake-3.12.0/Modules/Compi
string(APPEND CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT " -O2 -g -DNDEBUG") string(APPEND CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT " -O2 -g -DNDEBUG")
set(CMAKE_${lang}_CREATE_PREPROCESSED_SOURCE "<CMAKE_${lang}_COMPILER> <DEFINES> <INCLUDES> <FLAGS> -E <SOURCE> > <PREPROCESSED_SOURCE>") set(CMAKE_${lang}_CREATE_PREPROCESSED_SOURCE "<CMAKE_${lang}_COMPILER> <DEFINES> <INCLUDES> <FLAGS> -E <SOURCE> > <PREPROCESSED_SOURCE>")
set(CMAKE_${lang}_CREATE_ASSEMBLY_SOURCE "<CMAKE_${lang}_COMPILER> <DEFINES> <INCLUDES> <FLAGS> -S <SOURCE> -o <ASSEMBLY_SOURCE>") set(CMAKE_${lang}_CREATE_ASSEMBLY_SOURCE "<CMAKE_${lang}_COMPILER> <DEFINES> <INCLUDES> <FLAGS> -S <SOURCE> -o <ASSEMBLY_SOURCE>")
diff -up cmake-3.12.0/Modules/Compiler/GNU-Fortran.cmake.orig cmake-3.12.0/Modules/Compiler/GNU-Fortran.cmake Index: cmake-3.17.2/Modules/Compiler/GNU-Fortran.cmake
--- cmake-3.12.0/Modules/Compiler/GNU-Fortran.cmake.orig 2018-07-17 06:29:00.000000000 -0500 ===================================================================
+++ cmake-3.12.0/Modules/Compiler/GNU-Fortran.cmake 2018-07-27 08:51:37.487583601 -0500 --- cmake-3.17.2.orig/Modules/Compiler/GNU-Fortran.cmake
@@ -11,7 +11,7 @@ set(CMAKE_Fortran_POSTPROCESS_FLAG "-fpr +++ cmake-3.17.2/Modules/Compiler/GNU-Fortran.cmake
@@ -14,7 +14,7 @@ set(CMAKE_Fortran_POSTPROCESS_FLAG "-fpr
# No -DNDEBUG for Fortran. # No -DNDEBUG for Fortran.
string(APPEND CMAKE_Fortran_FLAGS_MINSIZEREL_INIT " -Os") string(APPEND CMAKE_Fortran_FLAGS_MINSIZEREL_INIT " -Os")
@ -47,9 +50,10 @@ diff -up cmake-3.12.0/Modules/Compiler/GNU-Fortran.cmake.orig cmake-3.12.0/Modul
# No -isystem for Fortran because it will not find .mod files. # No -isystem for Fortran because it will not find .mod files.
unset(CMAKE_INCLUDE_SYSTEM_FLAG_Fortran) unset(CMAKE_INCLUDE_SYSTEM_FLAG_Fortran)
diff -up cmake-3.12.0/Modules/Compiler/Intel.cmake.orig cmake-3.12.0/Modules/Compiler/Intel.cmake Index: cmake-3.17.2/Modules/Compiler/Intel.cmake
--- cmake-3.12.0/Modules/Compiler/Intel.cmake.orig 2018-07-17 06:29:00.000000000 -0500 ===================================================================
+++ cmake-3.12.0/Modules/Compiler/Intel.cmake 2018-07-27 08:51:37.489583613 -0500 --- cmake-3.17.2.orig/Modules/Compiler/Intel.cmake
+++ cmake-3.17.2/Modules/Compiler/Intel.cmake
@@ -22,7 +22,7 @@ else() @@ -22,7 +22,7 @@ else()
string(APPEND CMAKE_${lang}_FLAGS_INIT " ") string(APPEND CMAKE_${lang}_FLAGS_INIT " ")
string(APPEND CMAKE_${lang}_FLAGS_DEBUG_INIT " -g") string(APPEND CMAKE_${lang}_FLAGS_DEBUG_INIT " -g")
@ -58,11 +62,12 @@ diff -up cmake-3.12.0/Modules/Compiler/Intel.cmake.orig cmake-3.12.0/Modules/Com
+ string(APPEND CMAKE_${lang}_FLAGS_RELEASE_INIT " -O2") + string(APPEND CMAKE_${lang}_FLAGS_RELEASE_INIT " -O2")
string(APPEND CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT " -O2 -g") string(APPEND CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT " -O2 -g")
set(CMAKE_${lang}_COMPILER_PREDEFINES_COMMAND "${CMAKE_${lang}_COMPILER}" "-QdM" "-P" "-Za" "${CMAKE_ROOT}/Modules/CMakeCXXCompilerABI.cpp") set(CMAKE_${lang}_COMPILER_PREDEFINES_COMMAND "${CMAKE_${lang}_COMPILER}")
diff -up cmake-3.12.0/Modules/Compiler/NVIDIA-CUDA.cmake.orig cmake-3.12.0/Modules/Compiler/NVIDIA-CUDA.cmake Index: cmake-3.17.2/Modules/Compiler/NVIDIA-CUDA.cmake
--- cmake-3.12.0/Modules/Compiler/NVIDIA-CUDA.cmake.orig 2018-07-17 06:29:00.000000000 -0500 ===================================================================
+++ cmake-3.12.0/Modules/Compiler/NVIDIA-CUDA.cmake 2018-07-27 08:51:37.490583619 -0500 --- cmake-3.17.2.orig/Modules/Compiler/NVIDIA-CUDA.cmake
@@ -9,7 +9,7 @@ if(NOT "x${CMAKE_CUDA_SIMULATE_ID}" STRE +++ cmake-3.17.2/Modules/Compiler/NVIDIA-CUDA.cmake
@@ -36,7 +36,7 @@ if(NOT "x${CMAKE_CUDA_SIMULATE_ID}" STRE
set(CMAKE_SHARED_LIBRARY_CUDA_FLAGS -fPIC) set(CMAKE_SHARED_LIBRARY_CUDA_FLAGS -fPIC)
string(APPEND CMAKE_CUDA_FLAGS_INIT " ") string(APPEND CMAKE_CUDA_FLAGS_INIT " ")
string(APPEND CMAKE_CUDA_FLAGS_DEBUG_INIT " -g") string(APPEND CMAKE_CUDA_FLAGS_DEBUG_INIT " -g")
@ -71,9 +76,10 @@ diff -up cmake-3.12.0/Modules/Compiler/NVIDIA-CUDA.cmake.orig cmake-3.12.0/Modul
string(APPEND CMAKE_CUDA_FLAGS_MINSIZEREL_INIT " -O1 -DNDEBUG") string(APPEND CMAKE_CUDA_FLAGS_MINSIZEREL_INIT " -O1 -DNDEBUG")
string(APPEND CMAKE_CUDA_FLAGS_RELWITHDEBINFO_INIT " -O2 -g -DNDEBUG") string(APPEND CMAKE_CUDA_FLAGS_RELWITHDEBINFO_INIT " -O2 -g -DNDEBUG")
endif() endif()
diff -up cmake-3.12.0/Modules/Compiler/PathScale.cmake.orig cmake-3.12.0/Modules/Compiler/PathScale.cmake Index: cmake-3.17.2/Modules/Compiler/PathScale.cmake
--- cmake-3.12.0/Modules/Compiler/PathScale.cmake.orig 2018-07-17 06:29:00.000000000 -0500 ===================================================================
+++ cmake-3.12.0/Modules/Compiler/PathScale.cmake 2018-07-27 08:51:37.490583619 -0500 --- cmake-3.17.2.orig/Modules/Compiler/PathScale.cmake
+++ cmake-3.17.2/Modules/Compiler/PathScale.cmake
@@ -16,6 +16,6 @@ macro(__compiler_pathscale lang) @@ -16,6 +16,6 @@ macro(__compiler_pathscale lang)
string(APPEND CMAKE_${lang}_FLAGS_INIT " ") string(APPEND CMAKE_${lang}_FLAGS_INIT " ")
string(APPEND CMAKE_${lang}_FLAGS_DEBUG_INIT " -g -O0") string(APPEND CMAKE_${lang}_FLAGS_DEBUG_INIT " -g -O0")
@ -82,9 +88,10 @@ diff -up cmake-3.12.0/Modules/Compiler/PathScale.cmake.orig cmake-3.12.0/Modules
+ string(APPEND CMAKE_${lang}_FLAGS_RELEASE_INIT " -O2") + string(APPEND CMAKE_${lang}_FLAGS_RELEASE_INIT " -O2")
string(APPEND CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT " -g -O2") string(APPEND CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT " -g -O2")
endmacro() endmacro()
diff -up cmake-3.12.0/Modules/Compiler/PGI.cmake.orig cmake-3.12.0/Modules/Compiler/PGI.cmake Index: cmake-3.17.2/Modules/Compiler/PGI.cmake
--- cmake-3.12.0/Modules/Compiler/PGI.cmake.orig 2018-07-17 06:29:00.000000000 -0500 ===================================================================
+++ cmake-3.12.0/Modules/Compiler/PGI.cmake 2018-07-27 08:51:37.492583631 -0500 --- cmake-3.17.2.orig/Modules/Compiler/PGI.cmake
+++ cmake-3.17.2/Modules/Compiler/PGI.cmake
@@ -18,7 +18,7 @@ macro(__compiler_pgi lang) @@ -18,7 +18,7 @@ macro(__compiler_pgi lang)
string(APPEND CMAKE_${lang}_FLAGS_INIT " ") string(APPEND CMAKE_${lang}_FLAGS_INIT " ")
string(APPEND CMAKE_${lang}_FLAGS_DEBUG_INIT " -g -O0") string(APPEND CMAKE_${lang}_FLAGS_DEBUG_INIT " -g -O0")
@ -94,9 +101,10 @@ diff -up cmake-3.12.0/Modules/Compiler/PGI.cmake.orig cmake-3.12.0/Modules/Compi
string(APPEND CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT " -O2 -gopt") string(APPEND CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT " -O2 -gopt")
if(CMAKE_HOST_WIN32) if(CMAKE_HOST_WIN32)
diff -up cmake-3.12.0/Modules/Compiler/SunPro-ASM.cmake.orig cmake-3.12.0/Modules/Compiler/SunPro-ASM.cmake Index: cmake-3.17.2/Modules/Compiler/SunPro-ASM.cmake
--- cmake-3.12.0/Modules/Compiler/SunPro-ASM.cmake.orig 2018-07-17 06:29:00.000000000 -0500 ===================================================================
+++ cmake-3.12.0/Modules/Compiler/SunPro-ASM.cmake 2018-07-27 08:51:37.492583631 -0500 --- cmake-3.17.2.orig/Modules/Compiler/SunPro-ASM.cmake
+++ cmake-3.17.2/Modules/Compiler/SunPro-ASM.cmake
@@ -11,7 +11,7 @@ set(CMAKE_SHARED_LIBRARY_SONAME_ASM_FLAG @@ -11,7 +11,7 @@ set(CMAKE_SHARED_LIBRARY_SONAME_ASM_FLAG
string(APPEND CMAKE_ASM_FLAGS_INIT " ") string(APPEND CMAKE_ASM_FLAGS_INIT " ")
string(APPEND CMAKE_ASM_FLAGS_DEBUG_INIT " -g") string(APPEND CMAKE_ASM_FLAGS_DEBUG_INIT " -g")
@ -106,10 +114,11 @@ diff -up cmake-3.12.0/Modules/Compiler/SunPro-ASM.cmake.orig cmake-3.12.0/Module
string(APPEND CMAKE_ASM_FLAGS_RELWITHDEBINFO_INIT " -g -xO2 -DNDEBUG") string(APPEND CMAKE_ASM_FLAGS_RELWITHDEBINFO_INIT " -g -xO2 -DNDEBUG")
# Initialize ASM link type selection flags. These flags are used when # Initialize ASM link type selection flags. These flags are used when
diff -up cmake-3.12.0/Modules/Compiler/SunPro-C.cmake.orig cmake-3.12.0/Modules/Compiler/SunPro-C.cmake Index: cmake-3.17.2/Modules/Compiler/SunPro-C.cmake
--- cmake-3.12.0/Modules/Compiler/SunPro-C.cmake.orig 2018-07-17 06:29:00.000000000 -0500 ===================================================================
+++ cmake-3.12.0/Modules/Compiler/SunPro-C.cmake 2018-07-27 08:51:37.492583631 -0500 --- cmake-3.17.2.orig/Modules/Compiler/SunPro-C.cmake
@@ -15,7 +15,7 @@ set(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG " +++ cmake-3.17.2/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_INIT " ")
string(APPEND CMAKE_C_FLAGS_DEBUG_INIT " -g") string(APPEND CMAKE_C_FLAGS_DEBUG_INIT " -g")
string(APPEND CMAKE_C_FLAGS_MINSIZEREL_INIT " -xO2 -xspace -DNDEBUG") string(APPEND CMAKE_C_FLAGS_MINSIZEREL_INIT " -xO2 -xspace -DNDEBUG")
@ -118,10 +127,11 @@ diff -up cmake-3.12.0/Modules/Compiler/SunPro-C.cmake.orig cmake-3.12.0/Modules/
string(APPEND CMAKE_C_FLAGS_RELWITHDEBINFO_INIT " -g -xO2 -DNDEBUG") string(APPEND CMAKE_C_FLAGS_RELWITHDEBINFO_INIT " -g -xO2 -DNDEBUG")
set(CMAKE_DEPFILE_FLAGS_C "-xMD -xMF <DEPFILE>") set(CMAKE_DEPFILE_FLAGS_C "-xMD -xMF <DEPFILE>")
diff -up cmake-3.12.0/Modules/Compiler/SunPro-CXX.cmake.orig cmake-3.12.0/Modules/Compiler/SunPro-CXX.cmake Index: cmake-3.17.2/Modules/Compiler/SunPro-CXX.cmake
--- cmake-3.12.0/Modules/Compiler/SunPro-CXX.cmake.orig 2018-07-17 06:29:00.000000000 -0500 ===================================================================
+++ cmake-3.12.0/Modules/Compiler/SunPro-CXX.cmake 2018-07-27 08:51:37.493583637 -0500 --- cmake-3.17.2.orig/Modules/Compiler/SunPro-CXX.cmake
@@ -15,7 +15,7 @@ set(CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG +++ cmake-3.17.2/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_INIT " ")
string(APPEND CMAKE_CXX_FLAGS_DEBUG_INIT " -g") string(APPEND CMAKE_CXX_FLAGS_DEBUG_INIT " -g")
string(APPEND CMAKE_CXX_FLAGS_MINSIZEREL_INIT " -xO2 -xspace -DNDEBUG") string(APPEND CMAKE_CXX_FLAGS_MINSIZEREL_INIT " -xO2 -xspace -DNDEBUG")
@ -130,10 +140,11 @@ diff -up cmake-3.12.0/Modules/Compiler/SunPro-CXX.cmake.orig cmake-3.12.0/Module
string(APPEND CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT " -g -xO2 -DNDEBUG") string(APPEND CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT " -g -xO2 -DNDEBUG")
set(CMAKE_DEPFILE_FLAGS_CXX "-xMD -xMF <DEPFILE>") set(CMAKE_DEPFILE_FLAGS_CXX "-xMD -xMF <DEPFILE>")
diff -up cmake-3.12.0/Modules/Compiler/SunPro-Fortran.cmake.orig cmake-3.12.0/Modules/Compiler/SunPro-Fortran.cmake Index: cmake-3.17.2/Modules/Compiler/SunPro-Fortran.cmake
--- cmake-3.12.0/Modules/Compiler/SunPro-Fortran.cmake.orig 2018-07-17 06:29:00.000000000 -0500 ===================================================================
+++ cmake-3.12.0/Modules/Compiler/SunPro-Fortran.cmake 2018-07-27 08:51:37.493583637 -0500 --- cmake-3.17.2.orig/Modules/Compiler/SunPro-Fortran.cmake
@@ -13,7 +13,7 @@ set(CMAKE_EXECUTABLE_RUNTIME_Fortran_FLA +++ cmake-3.17.2/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_INIT " ")
string(APPEND CMAKE_Fortran_FLAGS_DEBUG_INIT " -g") string(APPEND CMAKE_Fortran_FLAGS_DEBUG_INIT " -g")
string(APPEND CMAKE_Fortran_FLAGS_MINSIZEREL_INIT " -xO2 -xspace -DNDEBUG") string(APPEND CMAKE_Fortran_FLAGS_MINSIZEREL_INIT " -xO2 -xspace -DNDEBUG")
@ -142,27 +153,16 @@ diff -up cmake-3.12.0/Modules/Compiler/SunPro-Fortran.cmake.orig cmake-3.12.0/Mo
string(APPEND CMAKE_Fortran_FLAGS_RELWITHDEBINFO_INIT " -g -xO2 -DNDEBUG") string(APPEND CMAKE_Fortran_FLAGS_RELWITHDEBINFO_INIT " -g -xO2 -DNDEBUG")
set(CMAKE_Fortran_MODDIR_FLAG "-moddir=") set(CMAKE_Fortran_MODDIR_FLAG "-moddir=")
set(CMAKE_Fortran_MODPATH_FLAG "-M") set(CMAKE_Fortran_MODPATH_FLAG "-M")
diff -up cmake-3.12.0/Modules/Platform/IRIX64.cmake.orig cmake-3.12.0/Modules/Platform/IRIX64.cmake Index: cmake-3.17.2/Modules/Platform/Windows-Clang.cmake
--- cmake-3.12.0/Modules/Platform/IRIX64.cmake.orig 2018-07-17 06:29:00.000000000 -0500 ===================================================================
+++ cmake-3.12.0/Modules/Platform/IRIX64.cmake 2018-07-27 08:51:37.492583631 -0500 --- cmake-3.17.2.orig/Modules/Platform/Windows-Clang.cmake
@@ -37,7 +37,7 @@ if(NOT CMAKE_COMPILER_IS_GNUCC) +++ cmake-3.17.2/Modules/Platform/Windows-Clang.cmake
set(CMAKE_CXX_CREATE_STATIC_LIBRARY @@ -79,7 +79,7 @@ macro(__windows_compiler_clang_gnu lang)
"<CMAKE_CXX_COMPILER> -ar -o <TARGET> <OBJECTS>")
set (CMAKE_CXX_FLAGS_DEBUG_INIT "-g") string(APPEND CMAKE_${lang}_FLAGS_DEBUG_INIT " -g -Xclang -gcodeview -O0 ${__ADDED_FLAGS_DEBUG}")
- set (CMAKE_CXX_FLAGS_MINSIZEREL_INIT "-O3 -DNDEBUG") string(APPEND CMAKE_${lang}_FLAGS_MINSIZEREL_INIT " -Os -DNDEBUG ${__ADDED_FLAGS}")
+ set (CMAKE_CXX_FLAGS_MINSIZEREL_INIT "-O2 -DNDEBUG") - string(APPEND CMAKE_${lang}_FLAGS_RELEASE_INIT " -O3 -DNDEBUG ${__ADDED_FLAGS}")
set (CMAKE_CXX_FLAGS_RELEASE_INIT "-O2 -DNDEBUG") + string(APPEND CMAKE_${lang}_FLAGS_RELEASE_INIT " -O2 -DNDEBUG ${__ADDED_FLAGS}")
set (CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT "-O2") string(APPEND CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT " -O2 -g -DNDEBUG -Xclang -gcodeview ${__ADDED_FLAGS}")
endif() endif()
diff -up cmake-3.12.0/Modules/Platform/IRIX.cmake.orig cmake-3.12.0/Modules/Platform/IRIX.cmake set(CMAKE_INCLUDE_SYSTEM_FLAG_${lang} "-isystem ")
--- cmake-3.12.0/Modules/Platform/IRIX.cmake.orig 2018-07-17 06:29:00.000000000 -0500
+++ cmake-3.12.0/Modules/Platform/IRIX.cmake 2018-07-27 08:51:37.491583625 -0500
@@ -7,7 +7,7 @@ if(NOT CMAKE_COMPILER_IS_GNUCXX)
"<CMAKE_CXX_COMPILER> -ar -o <TARGET> <OBJECTS>")
set (CMAKE_CXX_FLAGS_INIT "")
set (CMAKE_CXX_FLAGS_DEBUG_INIT "-g")
- set (CMAKE_CXX_FLAGS_MINSIZEREL_INIT "-O3 -DNDEBUG")
+ set (CMAKE_CXX_FLAGS_MINSIZEREL_INIT "-O2 -DNDEBUG")
set (CMAKE_CXX_FLAGS_RELEASE_INIT "-O2 -DNDEBUG")
set (CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT "-O2")
set (CMAKE_C_FLAGS_INIT "")

8
cmake-findruby.patch
View File

@ -1,8 +1,8 @@
Index: cmake-3.10.0/Modules/FindRuby.cmake Index: cmake-3.17.2/Modules/FindRuby.cmake
=================================================================== ===================================================================
--- cmake-3.10.0.orig/Modules/FindRuby.cmake --- cmake-3.17.2.orig/Modules/FindRuby.cmake
+++ cmake-3.10.0/Modules/FindRuby.cmake +++ cmake-3.17.2/Modules/FindRuby.cmake
@@ -106,14 +106,8 @@ if(RUBY_EXECUTABLE AND NOT RUBY_VERSIO @@ -110,14 +110,8 @@ if(RUBY_EXECUTABLE AND NOT RUBY_VERSIO
_RUBY_CONFIG_VAR("sitearchdir" RUBY_SITEARCH_DIR) _RUBY_CONFIG_VAR("sitearchdir" RUBY_SITEARCH_DIR)
_RUBY_CONFIG_VAR("sitelibdir" RUBY_SITELIB_DIR) _RUBY_CONFIG_VAR("sitelibdir" RUBY_SITELIB_DIR)

15
cmake-mingw-dl.patch
View File

@ -1,8 +1,13 @@
diff -rupN cmake-3.10.1/Modules/Platform/Windows-GNU.cmake cmake-3.10.1-new/Modules/Platform/Windows-GNU.cmake Index: cmake-3.17.2/Modules/Platform/Windows-GNU.cmake
--- cmake-3.10.1/Modules/Platform/Windows-GNU.cmake 2017-12-13 14:25:23.000000000 +0100 ===================================================================
+++ cmake-3.10.1-new/Modules/Platform/Windows-GNU.cmake 2017-12-30 15:32:03.253515499 +0100 --- cmake-3.17.2.orig/Modules/Platform/Windows-GNU.cmake
@@ -28,9 +28,11 @@ if(MINGW) +++ cmake-3.17.2/Modules/Platform/Windows-GNU.cmake
set(CMAKE_FIND_LIBRARY_SUFFIXES ".dll" ".dll.a" ".a" ".lib") @@ -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_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_CXX_STANDARD_LIBRARIES_INIT "${CMAKE_C_STANDARD_LIBRARIES_INIT}")
+ set(CMAKE_DL_LIBS "dl") + set(CMAKE_DL_LIBS "dl")

10
cmake.spec
View File

@ -9,12 +9,12 @@
%{?rcsuf:%global versuf -%{rcsuf}} %{?rcsuf:%global versuf -%{rcsuf}}
Name: cmake Name: cmake
Version: 3.12.1 Version: 3.17.2
Release: 6 Release: 1
Summary: Cross-platform make system Summary: Cross-platform make system
License: BSD and MIT and zlib License: BSD and MIT and zlib
URL: http://www.cmake.org URL: http://www.cmake.org
Source0: http://www.cmake.org/files/v3.12/cmake-%{version}.tar.gz Source0: https://www.cmake.org/files/v3.17/cmake-%{version}.tar.gz
Source1: cmake-init.el Source1: cmake-init.el
Source2: macros.cmake Source2: macros.cmake
Source3: cmake.attr Source3: cmake.attr
@ -155,7 +155,6 @@ cp -p Utilities/cmcurl/COPYING ./COPYING_cmcurl
cp -p Utilities/cmlibrhash/COPYING ./COPYING_cmlibrhash cp -p Utilities/cmlibrhash/COPYING ./COPYING_cmlibrhash
cp -p Utilities/cmzlib/Copyright.txt ./Copyright_cmzlib cp -p Utilities/cmzlib/Copyright.txt ./Copyright_cmzlib
cp -p Utilities/cmexpat/COPYING ./COPYING_cmexpat cp -p Utilities/cmexpat/COPYING ./COPYING_cmexpat
cp -p Utilities/cmcompress/Copyright.txt ./Copyright_cmcompress
install -d %{buildroot}%{_pkgdocdir} install -d %{buildroot}%{_pkgdocdir}
cp -pr %{buildroot}%{_datadir}/cmake/Help %{buildroot}%{_pkgdocdir} cp -pr %{buildroot}%{_datadir}/cmake/Help %{buildroot}%{_pkgdocdir}
@ -231,6 +230,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%exclude %{_pkgdocdir}/Copyright.txt %exclude %{_pkgdocdir}/Copyright.txt
%changelog %changelog
* Mon May 25 2020 licihua <licihua@huawei.com> - 3.17.2-1
- Update to cmake-3.17.2
* Fri Apr 03 2020 zhouyihang <zhouyihang1@huawei.com> - 3.12.1-6 * Fri Apr 03 2020 zhouyihang <zhouyihang1@huawei.com> - 3.12.1-6
- Remove useless scriptlet - Remove useless scriptlet