Compare commits
5 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
406c1c148a | ||
|
319919b16e | ||
|
3238564158 | ||
|
2b4f452d76 | ||
|
01437f47be |
30
.gitignore
vendored
30
.gitignore
vendored
@ -1 +1,29 @@
|
|||||||
/cmake-*.tar.gz
|
cmake-2.8.2.tar.gz
|
||||||
|
/cmake-2.8.3-rc1.tar.gz
|
||||||
|
/cmake-2.8.3-rc3.tar.gz
|
||||||
|
/cmake-2.8.3-rc4.tar.gz
|
||||||
|
/cmake-2.8.3.tar.gz
|
||||||
|
/cmake-2.8.4-rc1.tar.gz
|
||||||
|
/cmake-2.8.4-rc2.tar.gz
|
||||||
|
/cmake-2.8.4.tar.gz
|
||||||
|
/cmake-2.8.5-rc1.tar.gz
|
||||||
|
/cmake-2.8.5-rc2.tar.gz
|
||||||
|
/cmake-2.8.5-rc3.tar.gz
|
||||||
|
/cmake-2.8.5.tar.gz
|
||||||
|
/cmake-2.8.6-rc1.tar.gz
|
||||||
|
/cmake-2.8.6-rc2.tar.gz
|
||||||
|
/cmake-2.8.6-rc3.tar.gz
|
||||||
|
/cmake-2.8.6-rc4.tar.gz
|
||||||
|
/cmake-2.8.6.tar.gz
|
||||||
|
/cmake-2.8.7-rc1.tar.gz
|
||||||
|
/cmake-2.8.7-rc2.tar.gz
|
||||||
|
/cmake-2.8.7.tar.gz
|
||||||
|
/cmake-2.8.8-rc1.tar.gz
|
||||||
|
/cmake-2.8.8-rc2.tar.gz
|
||||||
|
/cmake-2.8.8.tar.gz
|
||||||
|
/cmake-2.8.9-rc1.tar.gz
|
||||||
|
/cmake-2.8.9-rc2.tar.gz
|
||||||
|
/cmake-2.8.9-rc3.tar.gz
|
||||||
|
/cmake-2.8.9.tar.gz
|
||||||
|
/cmake-2.8.10-rc3.tar.gz
|
||||||
|
/cmake-2.8.10.tar.gz
|
||||||
|
25
5383.patch
25
5383.patch
@ -1,25 +0,0 @@
|
|||||||
From 23cd98a66a3eca1cc8e89a77f4fdf406c4f4c113 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Marc Chevrier <marc.chevrier@gmail.com>
|
|
||||||
Date: Fri, 16 Oct 2020 11:36:53 +0200
|
|
||||||
Subject: [PATCH] FindPython: Add support of version 3.10
|
|
||||||
|
|
||||||
---
|
|
||||||
Modules/FindPython/Support.cmake | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/Modules/FindPython/Support.cmake b/Modules/FindPython/Support.cmake
|
|
||||||
index 7de2d29946..2b911ae7e3 100644
|
|
||||||
--- a/Modules/FindPython/Support.cmake
|
|
||||||
+++ b/Modules/FindPython/Support.cmake
|
|
||||||
@@ -22,7 +22,7 @@ if (NOT DEFINED _${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR)
|
|
||||||
message (FATAL_ERROR "FindPython: INTERNAL ERROR")
|
|
||||||
endif()
|
|
||||||
if (_${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR EQUAL "3")
|
|
||||||
- set(_${_PYTHON_PREFIX}_VERSIONS 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
|
|
||||||
+ set(_${_PYTHON_PREFIX}_VERSIONS 3.10 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
|
|
||||||
elseif (_${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR EQUAL "2")
|
|
||||||
set(_${_PYTHON_PREFIX}_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0)
|
|
||||||
else()
|
|
||||||
--
|
|
||||||
GitLab
|
|
||||||
|
|
42
5482.patch
42
5482.patch
@ -1,42 +0,0 @@
|
|||||||
From bb2ebbf2412ef9343f50a45868459ffb95fa9081 Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
|
|
||||||
Date: Mon, 9 Nov 2020 17:35:13 +0100
|
|
||||||
Subject: [PATCH] FindPython{Interp,Libs}: Add support for version 3.10
|
|
||||||
|
|
||||||
Extend the change from commit 23cd98a66a (FindPython: Add support of
|
|
||||||
version 3.10, 2020-10-16, v3.19.0-rc2~25^2) to cover the legacy
|
|
||||||
`FindPython{Interp,Libs}` modules too.
|
|
||||||
---
|
|
||||||
Modules/FindPythonInterp.cmake | 2 +-
|
|
||||||
Modules/FindPythonLibs.cmake | 2 +-
|
|
||||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/Modules/FindPythonInterp.cmake b/Modules/FindPythonInterp.cmake
|
|
||||||
index 1e01a99cbe..efe0f11901 100644
|
|
||||||
--- a/Modules/FindPythonInterp.cmake
|
|
||||||
+++ b/Modules/FindPythonInterp.cmake
|
|
||||||
@@ -54,7 +54,7 @@ unset(_Python_NAMES)
|
|
||||||
|
|
||||||
set(_PYTHON1_VERSIONS 1.6 1.5)
|
|
||||||
set(_PYTHON2_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0)
|
|
||||||
-set(_PYTHON3_VERSIONS 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
|
|
||||||
+set(_PYTHON3_VERSIONS 3.10 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
|
|
||||||
|
|
||||||
if(PythonInterp_FIND_VERSION)
|
|
||||||
if(PythonInterp_FIND_VERSION_COUNT GREATER 1)
|
|
||||||
diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake
|
|
||||||
index d3ec7beec6..396f0d2ed4 100644
|
|
||||||
--- a/Modules/FindPythonLibs.cmake
|
|
||||||
+++ b/Modules/FindPythonLibs.cmake
|
|
||||||
@@ -79,7 +79,7 @@ set(CMAKE_FIND_FRAMEWORK LAST)
|
|
||||||
|
|
||||||
set(_PYTHON1_VERSIONS 1.6 1.5)
|
|
||||||
set(_PYTHON2_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0)
|
|
||||||
-set(_PYTHON3_VERSIONS 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
|
|
||||||
+set(_PYTHON3_VERSIONS 3.10 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
|
|
||||||
|
|
||||||
if(PythonLibs_FIND_VERSION)
|
|
||||||
if(PythonLibs_FIND_VERSION_COUNT GREATER 1)
|
|
||||||
--
|
|
||||||
GitLab
|
|
||||||
|
|
@ -1,69 +0,0 @@
|
|||||||
diff -ur cmake-3.18.2.orig/Modules/FindBLAS.cmake cmake-3.18.2/Modules/FindBLAS.cmake
|
|
||||||
--- cmake-3.18.2.orig/Modules/FindBLAS.cmake 2020-08-20 14:20:32.000000000 +0200
|
|
||||||
+++ cmake-3.18.2/Modules/FindBLAS.cmake 2020-09-14 19:36:13.952349073 +0200
|
|
||||||
@@ -27,6 +27,7 @@
|
|
||||||
possibilities. List of vendors valid in this module:
|
|
||||||
|
|
||||||
* ``Goto``
|
|
||||||
+ * ``FlexiBLAS``
|
|
||||||
* ``OpenBLAS``
|
|
||||||
* ``FLAME``
|
|
||||||
* ``ATLAS PhiPACK``
|
|
||||||
@@ -538,6 +539,22 @@
|
|
||||||
""
|
|
||||||
""
|
|
||||||
""
|
|
||||||
+ )
|
|
||||||
+ endif()
|
|
||||||
+endif()
|
|
||||||
+
|
|
||||||
+# FlexiBLAS? (http://www.mpi-magdeburg.mpg.de/mpcsc/software/FlexiBLAS/)
|
|
||||||
+if(BLA_VENDOR STREQUAL "FlexiBLAS" OR BLA_VENDOR STREQUAL "All")
|
|
||||||
+ if(NOT BLAS_LIBRARIES)
|
|
||||||
+ check_blas_libraries(
|
|
||||||
+ BLAS_LIBRARIES
|
|
||||||
+ BLAS
|
|
||||||
+ sgemm
|
|
||||||
+ ""
|
|
||||||
+ "flexiblas"
|
|
||||||
+ ""
|
|
||||||
+ ""
|
|
||||||
+ ""
|
|
||||||
)
|
|
||||||
endif()
|
|
||||||
endif()
|
|
||||||
diff -ur cmake-3.18.2.orig/Modules/FindLAPACK.cmake cmake-3.18.2/Modules/FindLAPACK.cmake
|
|
||||||
--- cmake-3.18.2.orig/Modules/FindLAPACK.cmake 2020-08-20 14:20:32.000000000 +0200
|
|
||||||
+++ cmake-3.18.2/Modules/FindLAPACK.cmake 2020-09-14 19:38:43.204639078 +0200
|
|
||||||
@@ -26,6 +26,7 @@
|
|
||||||
If set, checks only the specified vendor, if not set checks all the
|
|
||||||
possibilities. List of vendors valid in this module:
|
|
||||||
|
|
||||||
+ * ``FlexiBLAS``
|
|
||||||
* ``OpenBLAS``
|
|
||||||
* ``FLAME``
|
|
||||||
* ``Intel10_32`` (intel mkl v10 32 bit)
|
|
||||||
@@ -349,6 +350,23 @@
|
|
||||||
""
|
|
||||||
""
|
|
||||||
""
|
|
||||||
+ "${BLAS_LIBRARIES}"
|
|
||||||
+ )
|
|
||||||
+ endif()
|
|
||||||
+ endif()
|
|
||||||
+
|
|
||||||
+ # FlexiBLAS? (http://www.mpi-magdeburg.mpg.de/mpcsc/software/FlexiBLAS/)
|
|
||||||
+ if(BLA_VENDOR STREQUAL "FlexiBLAS" OR BLA_VENDOR STREQUAL "All")
|
|
||||||
+ if(NOT LAPACK_LIBRARIES)
|
|
||||||
+ check_lapack_libraries(
|
|
||||||
+ LAPACK_LIBRARIES
|
|
||||||
+ LAPACK
|
|
||||||
+ cheev
|
|
||||||
+ ""
|
|
||||||
+ "flexiblas"
|
|
||||||
+ ""
|
|
||||||
+ ""
|
|
||||||
+ ""
|
|
||||||
"${BLAS_LIBRARIES}"
|
|
||||||
)
|
|
||||||
endif()
|
|
163
cmake-FindPostgreSQL.patch
Normal file
163
cmake-FindPostgreSQL.patch
Normal file
@ -0,0 +1,163 @@
|
|||||||
|
diff -up cmake-2.8.10-rc3/Modules/FindPostgreSQL.cmake.findpostgresql cmake-2.8.10-rc3/Modules/FindPostgreSQL.cmake
|
||||||
|
--- cmake-2.8.10-rc3/Modules/FindPostgreSQL.cmake.findpostgresql 2012-10-24 11:12:01.000000000 -0600
|
||||||
|
+++ cmake-2.8.10-rc3/Modules/FindPostgreSQL.cmake 2012-10-24 19:49:54.189433358 -0600
|
||||||
|
@@ -92,77 +92,99 @@ set( PostgreSQL_ROOT_DIRECTORIES
|
||||||
|
#
|
||||||
|
# Look for an installation.
|
||||||
|
#
|
||||||
|
-find_path(PostgreSQL_INCLUDE_DIR
|
||||||
|
- NAMES libpq-fe.h
|
||||||
|
+find_path(PostgreSQL_CONFIG_DIR
|
||||||
|
+ NAMES pg_config
|
||||||
|
PATHS
|
||||||
|
# Look in other places.
|
||||||
|
${PostgreSQL_ROOT_DIRECTORIES}
|
||||||
|
PATH_SUFFIXES
|
||||||
|
- pgsql
|
||||||
|
- postgresql
|
||||||
|
- include
|
||||||
|
+ ""
|
||||||
|
+ bin
|
||||||
|
# Help the user find it if we cannot.
|
||||||
|
- DOC "The ${PostgreSQL_INCLUDE_DIR_MESSAGE}"
|
||||||
|
+ DOC "The ${PostgreSQL_ROOT_DIR_MESSAGE}"
|
||||||
|
)
|
||||||
|
|
||||||
|
-find_path(PostgreSQL_TYPE_INCLUDE_DIR
|
||||||
|
- NAMES catalog/pg_type.h
|
||||||
|
- PATHS
|
||||||
|
- # Look in other places.
|
||||||
|
- ${PostgreSQL_ROOT_DIRECTORIES}
|
||||||
|
- PATH_SUFFIXES
|
||||||
|
- postgresql
|
||||||
|
- pgsql/server
|
||||||
|
- postgresql/server
|
||||||
|
- include/server
|
||||||
|
- # Help the user find it if we cannot.
|
||||||
|
- DOC "The ${PostgreSQL_INCLUDE_DIR_MESSAGE}"
|
||||||
|
-)
|
||||||
|
-
|
||||||
|
-# The PostgreSQL library.
|
||||||
|
-set (PostgreSQL_LIBRARY_TO_FIND pq)
|
||||||
|
-# Setting some more prefixes for the library
|
||||||
|
-set (PostgreSQL_LIB_PREFIX "")
|
||||||
|
-if ( WIN32 )
|
||||||
|
- set (PostgreSQL_LIB_PREFIX ${PostgreSQL_LIB_PREFIX} "lib")
|
||||||
|
- set ( PostgreSQL_LIBRARY_TO_FIND ${PostgreSQL_LIB_PREFIX}${PostgreSQL_LIBRARY_TO_FIND})
|
||||||
|
-endif()
|
||||||
|
+macro (fail_if)
|
||||||
|
+ if (${ARGV})
|
||||||
|
+ message (WARNING "Couldn't determine PostgreSQL configuration.")
|
||||||
|
+ unset (PostgreSQL_CONFIG_DIR)
|
||||||
|
+ break ()
|
||||||
|
+ endif ()
|
||||||
|
+endmacro ()
|
||||||
|
+
|
||||||
|
+macro (run_pg_config arg var)
|
||||||
|
+ execute_process(COMMAND ${PostgreSQL_CONFIG_DIR}/pg_config ${arg}
|
||||||
|
+ RESULT_VARIABLE pgsql_config_result
|
||||||
|
+ OUTPUT_VARIABLE ${var}
|
||||||
|
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
|
||||||
|
+
|
||||||
|
+ fail_if (NOT ${pgsql_config_result} EQUAL 0 OR NOT ${var})
|
||||||
|
+endmacro ()
|
||||||
|
+
|
||||||
|
+foreach (once only)
|
||||||
|
+ fail_if (NOT PostgreSQL_CONFIG_DIR)
|
||||||
|
+
|
||||||
|
+ run_pg_config (--version PostgreSQL_VERSION_STRING)
|
||||||
|
+ string (REGEX REPLACE "^PostgreSQL (.*)$" "\\1"
|
||||||
|
+ PostgreSQL_VERSION_STRING "${PostgreSQL_VERSION_STRING}")
|
||||||
|
+ fail_if (NOT PostgreSQL_VERSION_STRING)
|
||||||
|
+
|
||||||
|
+ run_pg_config (--includedir PostgreSQL_INCLUDE_DIR)
|
||||||
|
+ fail_if (NOT EXISTS "${PostgreSQL_INCLUDE_DIR}/libpq-fe.h")
|
||||||
|
+
|
||||||
|
+ find_path(PostgreSQL_TYPE_INCLUDE_DIR
|
||||||
|
+ NAMES catalog/pg_type.h
|
||||||
|
+ PATHS ${PostgreSQL_INCLUDE_DIR}
|
||||||
|
+ PATH_SUFFIXES
|
||||||
|
+ pgsql/server
|
||||||
|
+ postgresql/server
|
||||||
|
+ include/server
|
||||||
|
+ # Help the user find it if we cannot.
|
||||||
|
+ DOC "The ${PostgreSQL_INCLUDE_DIR_MESSAGE}"
|
||||||
|
+ )
|
||||||
|
+ fail_if (NOT PostgreSQL_TYPE_INCLUDE_DIR)
|
||||||
|
+
|
||||||
|
+ set (PostgreSQL_INCLUDE_DIRS
|
||||||
|
+ ${PostgreSQL_INCLUDE_DIR} ${PostgreSQL_TYPE_INCLUDE_DIR})
|
||||||
|
+
|
||||||
|
+ run_pg_config (--libdir PostgreSQL_LIBRARY_DIRS)
|
||||||
|
+
|
||||||
|
+ # The PostgreSQL library.
|
||||||
|
+ set (PostgreSQL_LIBRARY_TO_FIND pq)
|
||||||
|
+ # Setting some more prefixes for the library
|
||||||
|
+ set (PostgreSQL_LIB_PREFIX "")
|
||||||
|
+ if (WIN32)
|
||||||
|
+ set (PostgreSQL_LIB_PREFIX ${PostgreSQL_LIB_PREFIX} "lib")
|
||||||
|
+ set (PostgreSQL_LIBRARY_TO_FIND ${PostgreSQL_LIB_PREFIX}${PostgreSQL_LIBRARY_TO_FIND})
|
||||||
|
+ endif()
|
||||||
|
+
|
||||||
|
+ find_library (PostgreSQL_LIBRARY_FOUND
|
||||||
|
+ NAMES ${PostgreSQL_LIBRARY_TO_FIND}
|
||||||
|
+ PATHS ${PostgreSQL_LIBRARY_DIRS}
|
||||||
|
+ PATH_SUFFIXES lib
|
||||||
|
+ )
|
||||||
|
+ fail_if (NOT PostgreSQL_LIBRARY_FOUND)
|
||||||
|
+ set (PostgreSQL_LIBRARIES ${PostgreSQL_LIBRARY_TO_FIND})
|
||||||
|
|
||||||
|
-find_library( PostgreSQL_LIBRARY
|
||||||
|
- NAMES ${PostgreSQL_LIBRARY_TO_FIND}
|
||||||
|
- PATHS
|
||||||
|
- ${PostgreSQL_ROOT_DIRECTORIES}
|
||||||
|
- PATH_SUFFIXES
|
||||||
|
- lib
|
||||||
|
-)
|
||||||
|
-get_filename_component(PostgreSQL_LIBRARY_DIR ${PostgreSQL_LIBRARY} PATH)
|
||||||
|
-
|
||||||
|
-if (PostgreSQL_INCLUDE_DIR AND EXISTS "${PostgreSQL_INCLUDE_DIR}/pg_config.h")
|
||||||
|
- file(STRINGS "${PostgreSQL_INCLUDE_DIR}/pg_config.h" pgsql_version_str
|
||||||
|
- REGEX "^#define[\t ]+PG_VERSION[\t ]+\".*\"")
|
||||||
|
-
|
||||||
|
- string(REGEX REPLACE "^#define[\t ]+PG_VERSION[\t ]+\"([^\"]*)\".*" "\\1"
|
||||||
|
- PostgreSQL_VERSION_STRING "${pgsql_version_str}")
|
||||||
|
- unset(pgsql_version_str)
|
||||||
|
-endif()
|
||||||
|
+endforeach()
|
||||||
|
|
||||||
|
# Did we find anything?
|
||||||
|
-include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
|
||||||
|
-find_package_handle_standard_args(PostgreSQL
|
||||||
|
- REQUIRED_VARS PostgreSQL_LIBRARY PostgreSQL_INCLUDE_DIR PostgreSQL_TYPE_INCLUDE_DIR
|
||||||
|
- VERSION_VAR PostgreSQL_VERSION_STRING)
|
||||||
|
-set( PostgreSQL_FOUND ${POSTGRESQL_FOUND})
|
||||||
|
+include (FindPackageHandleStandardArgs)
|
||||||
|
+find_package_handle_standard_args (PostgreSQL
|
||||||
|
+ REQUIRED_VARS
|
||||||
|
+ PostgreSQL_LIBRARY_DIRS
|
||||||
|
+ PostgreSQL_CONFIG_DIR
|
||||||
|
+ PostgreSQL_INCLUDE_DIRS
|
||||||
|
+ PostgreSQL_LIBRARIES
|
||||||
|
+ VERSION_VAR
|
||||||
|
+ PostgreSQL_VERSION_STRING
|
||||||
|
+)
|
||||||
|
+set (PostgreSQL_FOUND ${POSTGRESQL_FOUND})
|
||||||
|
|
||||||
|
# Now try to get the include and library path.
|
||||||
|
-if(PostgreSQL_FOUND)
|
||||||
|
-
|
||||||
|
- set(PostgreSQL_INCLUDE_DIRS ${PostgreSQL_INCLUDE_DIR} ${PostgreSQL_TYPE_INCLUDE_DIR} )
|
||||||
|
- set(PostgreSQL_LIBRARY_DIRS ${PostgreSQL_LIBRARY_DIR} )
|
||||||
|
- set(PostgreSQL_LIBRARIES ${PostgreSQL_LIBRARY_TO_FIND})
|
||||||
|
-
|
||||||
|
- #message("Final PostgreSQL include dir: ${PostgreSQL_INCLUDE_DIRS}")
|
||||||
|
- #message("Final PostgreSQL library dir: ${PostgreSQL_LIBRARY_DIRS}")
|
||||||
|
- #message("Final PostgreSQL libraries: ${PostgreSQL_LIBRARIES}")
|
||||||
|
+if (PostgreSQL_FOUND)
|
||||||
|
+ message (STATUS "PostgreSQL include dirs: ${PostgreSQL_INCLUDE_DIRS}")
|
||||||
|
+ message (STATUS "PostgreSQL library dirs: ${PostgreSQL_LIBRARY_DIRS}")
|
||||||
|
+ message (STATUS "PostgreSQL libraries: ${PostgreSQL_LIBRARIES}")
|
||||||
|
endif()
|
||||||
|
|
||||||
|
-mark_as_advanced(PostgreSQL_INCLUDE_DIR PostgreSQL_TYPE_INCLUDE_DIR PostgreSQL_LIBRARY )
|
14
cmake-ccmake-del-in-first-column.patch
Normal file
14
cmake-ccmake-del-in-first-column.patch
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
diff --git a/Source/CursesDialog/cmCursesStringWidget.cxx b/Source/CursesDialog/cmCursesStringWidget.cxx
|
||||||
|
index 5c7414f..bd1ff71 100644
|
||||||
|
--- a/Source/CursesDialog/cmCursesStringWidget.cxx
|
||||||
|
+++ b/Source/CursesDialog/cmCursesStringWidget.cxx
|
||||||
|
@@ -175,7 +175,7 @@ bool cmCursesStringWidget::HandleInput(int& key, cmCursesMainForm* fm,
|
||||||
|
}
|
||||||
|
else if ( key == ctrl('d') ||key == KEY_DC )
|
||||||
|
{
|
||||||
|
- if ( form->curcol > 0 )
|
||||||
|
+ if ( form->curcol >= 0 )
|
||||||
|
{
|
||||||
|
form_driver(form, REQ_DEL_CHAR);
|
||||||
|
}
|
||||||
|
|
90
cmake-dcmtk.patch
Normal file
90
cmake-dcmtk.patch
Normal file
@ -0,0 +1,90 @@
|
|||||||
|
diff -up cmake-2.8.6-rc1/Modules/FindDCMTK.cmake.dcmtk cmake-2.8.6-rc1/Modules/FindDCMTK.cmake
|
||||||
|
--- cmake-2.8.6-rc1/Modules/FindDCMTK.cmake.dcmtk 2011-08-26 10:51:46.000000000 -0600
|
||||||
|
+++ cmake-2.8.6-rc1/Modules/FindDCMTK.cmake 2011-08-29 16:58:07.299550799 -0600
|
||||||
|
@@ -30,6 +30,10 @@
|
||||||
|
# Written for VXL by Amitha Perera.
|
||||||
|
# Upgraded for GDCM by Mathieu Malaterre.
|
||||||
|
# Modified for EasyViz by Thomas Sondergaard.
|
||||||
|
+#
|
||||||
|
+# Wed Jul 27 2011 Ankur Sinha <ankursinha AT fedoraproject DOT org>
|
||||||
|
+# - Add all dcmtk libs
|
||||||
|
+# - Add usr/lib to paths
|
||||||
|
#
|
||||||
|
|
||||||
|
if(NOT DCMTK_FOUND AND NOT DCMTK_DIR)
|
||||||
|
@@ -44,20 +48,26 @@ endif()
|
||||||
|
|
||||||
|
foreach(lib
|
||||||
|
dcmdata
|
||||||
|
+ dcmdsig
|
||||||
|
dcmimage
|
||||||
|
dcmimgle
|
||||||
|
dcmjpeg
|
||||||
|
+ dcmjpls
|
||||||
|
dcmnet
|
||||||
|
dcmpstat
|
||||||
|
dcmqrdb
|
||||||
|
- dcmsign
|
||||||
|
dcmsr
|
||||||
|
dcmtls
|
||||||
|
+ dcmwlm
|
||||||
|
ijg12
|
||||||
|
ijg16
|
||||||
|
ijg8
|
||||||
|
+ libi2d
|
||||||
|
+ oflog
|
||||||
|
ofstd)
|
||||||
|
|
||||||
|
+
|
||||||
|
+
|
||||||
|
find_library(DCMTK_${lib}_LIBRARY
|
||||||
|
${lib}
|
||||||
|
PATHS
|
||||||
|
@@ -66,7 +76,8 @@ foreach(lib
|
||||||
|
${DCMTK_DIR}/${lib}/libsrc/Debug
|
||||||
|
${DCMTK_DIR}/${lib}/Release
|
||||||
|
${DCMTK_DIR}/${lib}/Debug
|
||||||
|
- ${DCMTK_DIR}/lib)
|
||||||
|
+ ${DCMTK_DIR}/lib
|
||||||
|
+ /usr/lib/dcmtk)
|
||||||
|
|
||||||
|
mark_as_advanced(DCMTK_${lib}_LIBRARY)
|
||||||
|
|
||||||
|
@@ -82,13 +93,16 @@ set(DCMTK_dcmdata_TEST_HEADER dctypes.h)
|
||||||
|
set(DCMTK_dcmimage_TEST_HEADER dicoimg.h)
|
||||||
|
set(DCMTK_dcmimgle_TEST_HEADER dcmimage.h)
|
||||||
|
set(DCMTK_dcmjpeg_TEST_HEADER djdecode.h)
|
||||||
|
+set(DCMTK_dcmjpls_TEST_HEADER djcodecd.h)
|
||||||
|
set(DCMTK_dcmnet_TEST_HEADER assoc.h)
|
||||||
|
set(DCMTK_dcmpstat_TEST_HEADER dcmpstat.h)
|
||||||
|
set(DCMTK_dcmqrdb_TEST_HEADER dcmqrdba.h)
|
||||||
|
set(DCMTK_dcmsign_TEST_HEADER sicert.h)
|
||||||
|
set(DCMTK_dcmsr_TEST_HEADER dsrtree.h)
|
||||||
|
set(DCMTK_dcmtls_TEST_HEADER tlslayer.h)
|
||||||
|
+set(DCMTK_dcmwlm_TEST_HEADER wldsfs.h)
|
||||||
|
set(DCMTK_ofstd_TEST_HEADER ofstdinc.h)
|
||||||
|
+set(DCMTK_oflog_TEST_HEADER oflog.h)
|
||||||
|
|
||||||
|
foreach(dir
|
||||||
|
config
|
||||||
|
@@ -96,16 +110,20 @@ foreach(dir
|
||||||
|
dcmimage
|
||||||
|
dcmimgle
|
||||||
|
dcmjpeg
|
||||||
|
+ dcmjpls
|
||||||
|
dcmnet
|
||||||
|
dcmpstat
|
||||||
|
dcmqrdb
|
||||||
|
dcmsign
|
||||||
|
dcmsr
|
||||||
|
dcmtls
|
||||||
|
+ dcmwlen
|
||||||
|
+ oflog
|
||||||
|
ofstd)
|
||||||
|
find_path(DCMTK_${dir}_INCLUDE_DIR
|
||||||
|
${DCMTK_${dir}_TEST_HEADER}
|
||||||
|
PATHS
|
||||||
|
+ /usr/include/dcmtk
|
||||||
|
${DCMTK_DIR}/${dir}/include
|
||||||
|
${DCMTK_DIR}/${dir}
|
||||||
|
${DCMTK_DIR}/include/${dir}
|
@ -1,168 +0,0 @@
|
|||||||
Index: cmake-3.17.0-rc1/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")
|
|
||||||
string(APPEND CMAKE_Fortran_FLAGS_MINSIZEREL_INIT " ")
|
|
||||||
-string(APPEND CMAKE_Fortran_FLAGS_RELEASE_INIT " -O3")
|
|
||||||
+string(APPEND CMAKE_Fortran_FLAGS_RELEASE_INIT " -O2")
|
|
||||||
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.17.0-rc1/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")
|
|
||||||
string(APPEND CMAKE_Fortran_FLAGS_MINSIZEREL_INIT " -Os")
|
|
||||||
-string(APPEND CMAKE_Fortran_FLAGS_RELEASE_INIT " -O3")
|
|
||||||
+string(APPEND CMAKE_Fortran_FLAGS_RELEASE_INIT " -O2")
|
|
||||||
string(APPEND CMAKE_Fortran_FLAGS_RELWITHDEBINFO_INIT " -O2 -g")
|
|
||||||
set(CMAKE_Fortran_MODDIR_FLAG "-fmod=")
|
|
||||||
set(CMAKE_Fortran_VERBOSE_FLAG "-v")
|
|
||||||
Index: cmake-3.17.0-rc1/Modules/Compiler/GNU.cmake
|
|
||||||
===================================================================
|
|
||||||
--- 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")
|
|
||||||
- string(APPEND CMAKE_${lang}_FLAGS_RELEASE_INIT " -O3 -DNDEBUG")
|
|
||||||
+ string(APPEND CMAKE_${lang}_FLAGS_RELEASE_INIT " -O2 -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_ASSEMBLY_SOURCE "<CMAKE_${lang}_COMPILER> <DEFINES> <INCLUDES> <FLAGS> -S <SOURCE> -o <ASSEMBLY_SOURCE>")
|
|
||||||
Index: cmake-3.17.0-rc1/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.
|
|
||||||
string(APPEND CMAKE_Fortran_FLAGS_MINSIZEREL_INIT " -Os")
|
|
||||||
-string(APPEND CMAKE_Fortran_FLAGS_RELEASE_INIT " -O3")
|
|
||||||
+string(APPEND CMAKE_Fortran_FLAGS_RELEASE_INIT " -O2")
|
|
||||||
|
|
||||||
# No -isystem for Fortran because it will not find .mod files.
|
|
||||||
unset(CMAKE_INCLUDE_SYSTEM_FLAG_Fortran)
|
|
||||||
Index: cmake-3.17.0-rc1/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")
|
|
||||||
string(APPEND CMAKE_${lang}_FLAGS_MINSIZEREL_INIT " -Os")
|
|
||||||
- string(APPEND CMAKE_${lang}_FLAGS_RELEASE_INIT " -O3")
|
|
||||||
+ string(APPEND CMAKE_${lang}_FLAGS_RELEASE_INIT " -O2")
|
|
||||||
string(APPEND CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT " -O2 -g")
|
|
||||||
|
|
||||||
set(CMAKE_${lang}_COMPILER_PREDEFINES_COMMAND "${CMAKE_${lang}_COMPILER}")
|
|
||||||
Index: cmake-3.17.0-rc1/Modules/Compiler/NVIDIA-CUDA.cmake
|
|
||||||
===================================================================
|
|
||||||
--- 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")
|
|
||||||
- string(APPEND CMAKE_CUDA_FLAGS_RELEASE_INIT " -O3 -DNDEBUG")
|
|
||||||
+ string(APPEND CMAKE_CUDA_FLAGS_RELEASE_INIT " -O2 -DNDEBUG")
|
|
||||||
string(APPEND CMAKE_CUDA_FLAGS_MINSIZEREL_INIT " -O1 -DNDEBUG")
|
|
||||||
string(APPEND CMAKE_CUDA_FLAGS_RELWITHDEBINFO_INIT " -O2 -g -DNDEBUG")
|
|
||||||
endif()
|
|
||||||
Index: cmake-3.17.0-rc1/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")
|
|
||||||
string(APPEND CMAKE_${lang}_FLAGS_MINSIZEREL_INIT " -Os")
|
|
||||||
- string(APPEND CMAKE_${lang}_FLAGS_RELEASE_INIT " -O3")
|
|
||||||
+ string(APPEND CMAKE_${lang}_FLAGS_RELEASE_INIT " -O2")
|
|
||||||
string(APPEND CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT " -g -O2")
|
|
||||||
endmacro()
|
|
||||||
Index: cmake-3.17.0-rc1/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")
|
|
||||||
string(APPEND CMAKE_${lang}_FLAGS_MINSIZEREL_INIT " -O2 -s")
|
|
||||||
- string(APPEND CMAKE_${lang}_FLAGS_RELEASE_INIT " -fast -O3")
|
|
||||||
+ string(APPEND CMAKE_${lang}_FLAGS_RELEASE_INIT " -fast -O2")
|
|
||||||
string(APPEND CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT " -O2 -gopt")
|
|
||||||
|
|
||||||
if(CMAKE_HOST_WIN32)
|
|
||||||
Index: cmake-3.17.0-rc1/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")
|
|
||||||
string(APPEND CMAKE_ASM_FLAGS_MINSIZEREL_INIT " -xO2 -xspace -DNDEBUG")
|
|
||||||
-string(APPEND CMAKE_ASM_FLAGS_RELEASE_INIT " -xO3 -DNDEBUG")
|
|
||||||
+string(APPEND CMAKE_ASM_FLAGS_RELEASE_INIT " -xO2 -DNDEBUG")
|
|
||||||
string(APPEND CMAKE_ASM_FLAGS_RELWITHDEBINFO_INIT " -g -xO2 -DNDEBUG")
|
|
||||||
|
|
||||||
# Initialize ASM link type selection flags. These flags are used when
|
|
||||||
Index: cmake-3.17.0-rc1/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")
|
|
||||||
string(APPEND CMAKE_C_FLAGS_MINSIZEREL_INIT " -xO2 -xspace -DNDEBUG")
|
|
||||||
-string(APPEND CMAKE_C_FLAGS_RELEASE_INIT " -xO3 -DNDEBUG")
|
|
||||||
+string(APPEND CMAKE_C_FLAGS_RELEASE_INIT " -xO2 -DNDEBUG")
|
|
||||||
string(APPEND CMAKE_C_FLAGS_RELWITHDEBINFO_INIT " -g -xO2 -DNDEBUG")
|
|
||||||
|
|
||||||
set(CMAKE_DEPFILE_FLAGS_C "-xMD -xMF <DEPFILE>")
|
|
||||||
Index: cmake-3.17.0-rc1/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")
|
|
||||||
string(APPEND CMAKE_CXX_FLAGS_MINSIZEREL_INIT " -xO2 -xspace -DNDEBUG")
|
|
||||||
-string(APPEND CMAKE_CXX_FLAGS_RELEASE_INIT " -xO3 -DNDEBUG")
|
|
||||||
+string(APPEND CMAKE_CXX_FLAGS_RELEASE_INIT " -xO2 -DNDEBUG")
|
|
||||||
string(APPEND CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT " -g -xO2 -DNDEBUG")
|
|
||||||
|
|
||||||
set(CMAKE_DEPFILE_FLAGS_CXX "-xMD -xMF <DEPFILE>")
|
|
||||||
Index: cmake-3.17.0-rc1/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")
|
|
||||||
string(APPEND CMAKE_Fortran_FLAGS_MINSIZEREL_INIT " -xO2 -xspace -DNDEBUG")
|
|
||||||
-string(APPEND CMAKE_Fortran_FLAGS_RELEASE_INIT " -xO3 -DNDEBUG")
|
|
||||||
+string(APPEND CMAKE_Fortran_FLAGS_RELEASE_INIT " -xO2 -DNDEBUG")
|
|
||||||
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 ")
|
|
@ -1,22 +1,20 @@
|
|||||||
Index: cmake-3.18.0-rc1/Modules/FindRuby.cmake
|
diff -up cmake-2.8.10-rc1/Modules/FindRuby.cmake.findruby cmake-2.8.10-rc1/Modules/FindRuby.cmake
|
||||||
===================================================================
|
--- cmake-2.8.10-rc1/Modules/FindRuby.cmake.findruby 2012-10-02 10:12:18.000000000 -0600
|
||||||
--- cmake-3.18.0-rc1.orig/Modules/FindRuby.cmake
|
+++ cmake-2.8.10-rc1/Modules/FindRuby.cmake 2012-10-02 15:50:30.463292214 -0600
|
||||||
+++ cmake-3.18.0-rc1/Modules/FindRuby.cmake
|
@@ -92,14 +92,8 @@ if(RUBY_EXECUTABLE AND NOT RUBY_VERSIO
|
||||||
@@ -289,14 +289,9 @@ if(Ruby_EXECUTABLE AND NOT Ruby_VERSION_
|
_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)
|
|
||||||
|
|
||||||
- # vendor_ruby available ?
|
- # vendor_ruby available ?
|
||||||
- execute_process(COMMAND ${Ruby_EXECUTABLE} -r vendor-specific -e "print 'true'"
|
- execute_process(COMMAND ${RUBY_EXECUTABLE} -r vendor-specific -e "print 'true'"
|
||||||
- OUTPUT_VARIABLE Ruby_HAS_VENDOR_RUBY ERROR_QUIET)
|
- OUTPUT_VARIABLE RUBY_HAS_VENDOR_RUBY ERROR_QUIET)
|
||||||
-
|
-
|
||||||
- if(Ruby_HAS_VENDOR_RUBY)
|
- if(RUBY_HAS_VENDOR_RUBY)
|
||||||
- _RUBY_CONFIG_VAR("vendorlibdir" Ruby_VENDORLIB_DIR)
|
- _RUBY_CONFIG_VAR("vendorlibdir" RUBY_VENDORLIB_DIR)
|
||||||
- _RUBY_CONFIG_VAR("vendorarchdir" Ruby_VENDORARCH_DIR)
|
- _RUBY_CONFIG_VAR("vendorarchdir" RUBY_VENDORARCH_DIR)
|
||||||
- endif()
|
- endif()
|
||||||
+ # vendor_ruby
|
+ _RUBY_CONFIG_VAR("vendorlibdir" RUBY_VENDORLIB_DIR)
|
||||||
+ _RUBY_CONFIG_VAR("vendorlibdir" Ruby_VENDORLIB_DIR)
|
+ _RUBY_CONFIG_VAR("vendorarchdir" RUBY_VENDORARCH_DIR)
|
||||||
+ _RUBY_CONFIG_VAR("vendorarchdir" Ruby_VENDORARCH_DIR)
|
|
||||||
|
|
||||||
# save the results in the cache so we don't have to run ruby the next time again
|
# save the results in the cache so we don't have to run ruby the next time again
|
||||||
set(Ruby_VERSION_MAJOR ${Ruby_VERSION_MAJOR} CACHE PATH "The Ruby major version" FORCE)
|
set(RUBY_VERSION_MAJOR ${RUBY_VERSION_MAJOR} CACHE PATH "The Ruby major version" FORCE)
|
||||||
|
@ -1,9 +0,0 @@
|
|||||||
;;
|
|
||||||
;; Setup cmake-mode for autoloading
|
|
||||||
;;
|
|
||||||
(autoload 'cmake-mode "cmake-mode" "Major mode for editing CMake listfiles." t)
|
|
||||||
(setq auto-mode-alist
|
|
||||||
(append
|
|
||||||
'(("CMakeLists\\.txt\\'" . cmake-mode))
|
|
||||||
'(("\\.cmake\\'" . cmake-mode))
|
|
||||||
auto-mode-alist))
|
|
@ -1,21 +0,0 @@
|
|||||||
Index: cmake-3.17.0-rc1/Modules/Platform/Windows-GNU.cmake
|
|
||||||
===================================================================
|
|
||||||
--- 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")
|
|
||||||
+else()
|
|
||||||
+ set(CMAKE_DL_LIBS "")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
-set(CMAKE_DL_LIBS "")
|
|
||||||
set(CMAKE_LIBRARY_PATH_FLAG "-L")
|
|
||||||
set(CMAKE_LINK_LIBRARY_FLAG "-l")
|
|
||||||
set(CMAKE_LINK_DEF_FILE_FLAG "") # Empty string: passing the file is enough
|
|
@ -1,3 +0,0 @@
|
|||||||
%__cmake_provides %{_rpmconfigdir}/cmake.prov
|
|
||||||
%__cmake_requires %{_rpmconfigdir}/cmake.req
|
|
||||||
%__cmake_path ^(%{_libdir}|%{_datadir})/cmake/.*/.*(Config\.cmake|-config\.cmake)$
|
|
82
cmake.prov
82
cmake.prov
@ -1,82 +0,0 @@
|
|||||||
#!/usr/bin/python3
|
|
||||||
# -*- coding:utf-8 -*-
|
|
||||||
#
|
|
||||||
# Copyright (C) 2015 Daniel Vrátil <dvratil@redhat.com>
|
|
||||||
# Copyright (C) 2017 Daniel Vrátil <dvratil@fedoraproject.org>
|
|
||||||
#
|
|
||||||
#
|
|
||||||
# This program is free software; you can redistribute it and/or modify
|
|
||||||
# it under the terms of the GNU Library General Public License as
|
|
||||||
# published by the Free Software Foundation; either version 2 of the
|
|
||||||
# License, or (at your option) any later version.
|
|
||||||
#
|
|
||||||
# This program is distributed in the hope that it will be useful,
|
|
||||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
# GNU General Public License for more details.
|
|
||||||
#
|
|
||||||
# You should have received a copy of the GNU Library General Public
|
|
||||||
# License along with this program; if not, write to the
|
|
||||||
# Free Software Foundation, Inc.,
|
|
||||||
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
||||||
#
|
|
||||||
|
|
||||||
import sys
|
|
||||||
import re
|
|
||||||
import glob
|
|
||||||
|
|
||||||
class CMakeParser:
|
|
||||||
def __init__(self, filelist = None):
|
|
||||||
if filelist == None:
|
|
||||||
filelist = sys.stdin
|
|
||||||
|
|
||||||
paths = map(lambda x: x.rstrip(), filelist.readlines())
|
|
||||||
for path in paths:
|
|
||||||
modulePath, cmakeModule, lowercase = self.parseCmakeModuleConfig(path)
|
|
||||||
if modulePath and cmakeModule:
|
|
||||||
version = self.resolveCMakeModuleVersion(modulePath, cmakeModule, lowercase)
|
|
||||||
|
|
||||||
if version:
|
|
||||||
string = "cmake(" + cmakeModule + ") = " + version
|
|
||||||
else:
|
|
||||||
string = "cmake(" + cmakeModule + ")"
|
|
||||||
if string == string.lower():
|
|
||||||
print(string)
|
|
||||||
else:
|
|
||||||
# Temporarily print both variants to satisfy requires
|
|
||||||
# by the old version of this generator which made mistakes
|
|
||||||
print(string)
|
|
||||||
print(string.lower())
|
|
||||||
|
|
||||||
|
|
||||||
def parseCmakeModuleConfig(self, configFile):
|
|
||||||
paths = configFile.rsplit("/", 3)
|
|
||||||
|
|
||||||
modulePath = "%s/cmake/%s" % (paths[0], paths[2])
|
|
||||||
cfgFile = paths[3]
|
|
||||||
if cfgFile.endswith("Config.cmake"):
|
|
||||||
return (modulePath, cfgFile[0:-len("Config.cmake")], False)
|
|
||||||
elif cfgFile.endswith("-config.cmake"):
|
|
||||||
return (modulePath, cfgFile[0:-len("-config.cmake")], True)
|
|
||||||
else:
|
|
||||||
return (None, None, False)
|
|
||||||
|
|
||||||
def resolveCMakeModuleVersion(self, modulePath, cmakeModule, lowercase):
|
|
||||||
versionFile = ("%s/%s-config-version.cmake" if lowercase else "%s/%sConfigVersion.cmake") % (modulePath, cmakeModule)
|
|
||||||
try:
|
|
||||||
f = open(versionFile, 'r')
|
|
||||||
except:
|
|
||||||
return None
|
|
||||||
|
|
||||||
for line in f:
|
|
||||||
line = line.strip()
|
|
||||||
|
|
||||||
# set(PACKAGE_VERSION <version>)
|
|
||||||
version = re.match(r"^set[\ ]*\([\ ]*PACKAGE_VERSION[\ ]+[\"]*([0-9\.]+)[\"]*[\ ]*[.]*\)", line)
|
|
||||||
if version:
|
|
||||||
return version.groups(1)[0]
|
|
||||||
|
|
||||||
return None
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
|
||||||
parser = CMakeParser()
|
|
70
cmake.req
70
cmake.req
@ -1,70 +0,0 @@
|
|||||||
#!/usr/bin/python3
|
|
||||||
# -*- coding:utf-8 -*-
|
|
||||||
#
|
|
||||||
# Copyright (C) 2017 Björn Esser <besser82@fedoraproject.org>
|
|
||||||
#
|
|
||||||
# based on cmake.prov, which is
|
|
||||||
# Copyright (C) 2015 Daniel Vrátil <dvratil@redhat.com>
|
|
||||||
# Copyright (C) 2017 Daniel Vrátil <dvratil@fedoraproject.org>
|
|
||||||
#
|
|
||||||
#
|
|
||||||
# This program is free software; you can redistribute it and/or modify
|
|
||||||
# it under the terms of the GNU Library General Public License as
|
|
||||||
# published by the Free Software Foundation; either version 2 of the
|
|
||||||
# License, or (at your option) any later version.
|
|
||||||
#
|
|
||||||
# This program is distributed in the hope that it will be useful,
|
|
||||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
# GNU General Public License for more details.
|
|
||||||
#
|
|
||||||
# You should have received a copy of the GNU Library General Public
|
|
||||||
# License along with this program; if not, write to the
|
|
||||||
# Free Software Foundation, Inc.,
|
|
||||||
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
||||||
#
|
|
||||||
|
|
||||||
import sys
|
|
||||||
import re
|
|
||||||
import subprocess
|
|
||||||
|
|
||||||
class CMakeParser:
|
|
||||||
def __init__(self, filelist = None):
|
|
||||||
if filelist == None:
|
|
||||||
filelist = sys.stdin
|
|
||||||
|
|
||||||
has_module = False
|
|
||||||
is_arched = False
|
|
||||||
|
|
||||||
isa_suf = subprocess.check_output(["/usr/bin/rpm", "-E %{?_isa}"]).decode().strip()
|
|
||||||
|
|
||||||
paths = map(lambda x: x.rstrip(), filelist.readlines())
|
|
||||||
for path in paths:
|
|
||||||
modulePath, cmakeModule, lowercase = self.parseCmakeModuleConfig(path)
|
|
||||||
if modulePath and cmakeModule:
|
|
||||||
has_module = True
|
|
||||||
if re.match(".*/usr/lib(64)?/cmake/.*", modulePath):
|
|
||||||
is_arched = True
|
|
||||||
|
|
||||||
if has_module:
|
|
||||||
if is_arched:
|
|
||||||
print("cmake-filesystem%s" % isa_suf)
|
|
||||||
else:
|
|
||||||
print("cmake-filesystem")
|
|
||||||
|
|
||||||
|
|
||||||
def parseCmakeModuleConfig(self, configFile):
|
|
||||||
paths = configFile.rsplit("/", 3)
|
|
||||||
|
|
||||||
modulePath = "%s/cmake/%s" % (paths[0], paths[2])
|
|
||||||
cfgFile = paths[3]
|
|
||||||
if cfgFile.endswith("Config.cmake"):
|
|
||||||
return (modulePath, cfgFile[0:-len("Config.cmake")], False)
|
|
||||||
elif cfgFile.endswith("-config.cmake"):
|
|
||||||
return (modulePath, cfgFile[0:-len("-config.cmake")], True)
|
|
||||||
else:
|
|
||||||
return (None, None, False)
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
|
||||||
parser = CMakeParser()
|
|
1312
cmake.spec
1312
cmake.spec
File diff suppressed because it is too large
Load Diff
42
macros.cmake
42
macros.cmake
@ -2,38 +2,17 @@
|
|||||||
# Macros for cmake
|
# Macros for cmake
|
||||||
#
|
#
|
||||||
%_cmake_lib_suffix64 -DLIB_SUFFIX=64
|
%_cmake_lib_suffix64 -DLIB_SUFFIX=64
|
||||||
%_cmake_shared_libs -DBUILD_SHARED_LIBS:BOOL=ON
|
|
||||||
%_cmake_skip_rpath -DCMAKE_SKIP_RPATH:BOOL=ON
|
%_cmake_skip_rpath -DCMAKE_SKIP_RPATH:BOOL=ON
|
||||||
%_cmake_version @@CMAKE_VERSION@@
|
%_cmake_version @@CMAKE_VERSION@@
|
||||||
%__cmake /usr/bin/cmake
|
%__cmake /usr/bin/cmake
|
||||||
%__ctest /usr/bin/ctest
|
|
||||||
%__cmake_builddir %{!?__cmake_in_source_build:%{_vpath_builddir}}%{?__cmake_in_source_build:.}
|
|
||||||
|
|
||||||
# - Set default compile flags
|
|
||||||
# - CMAKE_*_FLAGS_RELEASE are added *after* the *FLAGS environment variables
|
|
||||||
# and default to -O3 -DNDEBUG. Strip the -O3 so we can override with *FLAGS
|
|
||||||
# - Turn on verbose makefiles so we can see and verify compile flags
|
|
||||||
# - Turn off stripping by default so RPM can do it separately
|
|
||||||
# - Set default install prefixes and library install directories
|
|
||||||
# - Turn on shared libraries by default
|
|
||||||
%cmake \
|
%cmake \
|
||||||
%if 0%{?set_build_flags:1} \
|
|
||||||
%set_build_flags \
|
|
||||||
%else \
|
|
||||||
CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \
|
CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \
|
||||||
CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
|
CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
|
||||||
FFLAGS="${FFLAGS:-%optflags%{?_fmoddir: -I%_fmoddir}}" ; export FFLAGS ; \
|
FFLAGS="${FFLAGS:-%optflags%{?_fmoddir: -I%_fmoddir}}" ; export FFLAGS ; \
|
||||||
FCFLAGS="${FCFLAGS:-%optflags%{?_fmoddir: -I%_fmoddir}}" ; export FCFLAGS ; \
|
|
||||||
%{?__global_ldflags:LDFLAGS="${LDFLAGS:-%__global_ldflags}" ; export LDFLAGS ;} \
|
%{?__global_ldflags:LDFLAGS="${LDFLAGS:-%__global_ldflags}" ; export LDFLAGS ;} \
|
||||||
%endif \
|
|
||||||
%__cmake \\\
|
%__cmake \\\
|
||||||
%{!?__cmake_in_source_build:-S "%{_vpath_srcdir}"} \\\
|
-DCMAKE_VERBOSE_MAKEFILE=ON \\\
|
||||||
%{!?__cmake_in_source_build:-B "%{__cmake_builddir}"} \\\
|
|
||||||
-DCMAKE_C_FLAGS_RELEASE:STRING="-DNDEBUG" \\\
|
|
||||||
-DCMAKE_CXX_FLAGS_RELEASE:STRING="-DNDEBUG" \\\
|
|
||||||
-DCMAKE_Fortran_FLAGS_RELEASE:STRING="-DNDEBUG" \\\
|
|
||||||
-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \\\
|
|
||||||
-DCMAKE_INSTALL_DO_STRIP:BOOL=OFF \\\
|
|
||||||
-DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \\\
|
-DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \\\
|
||||||
-DINCLUDE_INSTALL_DIR:PATH=%{_includedir} \\\
|
-DINCLUDE_INSTALL_DIR:PATH=%{_includedir} \\\
|
||||||
-DLIB_INSTALL_DIR:PATH=%{_libdir} \\\
|
-DLIB_INSTALL_DIR:PATH=%{_libdir} \\\
|
||||||
@ -42,21 +21,4 @@
|
|||||||
%if "%{?_lib}" == "lib64" \
|
%if "%{?_lib}" == "lib64" \
|
||||||
%{?_cmake_lib_suffix64} \\\
|
%{?_cmake_lib_suffix64} \\\
|
||||||
%endif \
|
%endif \
|
||||||
%{?_cmake_shared_libs}
|
-DBUILD_SHARED_LIBS:BOOL=ON
|
||||||
|
|
||||||
%cmake_build \
|
|
||||||
%__cmake --build "%{__cmake_builddir}" %{?_smp_mflags} --verbose
|
|
||||||
|
|
||||||
%cmake_install \
|
|
||||||
DESTDIR="%{buildroot}" %__cmake --install "%{__cmake_builddir}"
|
|
||||||
|
|
||||||
%ctest(:-:) \
|
|
||||||
cd "%{__cmake_builddir}" \
|
|
||||||
%__ctest --output-on-failure --force-new-ctest-process %{?_smp_mflags} %{**} \
|
|
||||||
cd -
|
|
||||||
|
|
||||||
|
|
||||||
%cmake@@CMAKE_MAJOR_VERSION@@ %cmake
|
|
||||||
%cmake@@CMAKE_MAJOR_VERSION@@_build %cmake_build
|
|
||||||
%cmake@@CMAKE_MAJOR_VERSION@@_install %cmake_install
|
|
||||||
%ctest@@CMAKE_MAJOR_VERSION@@(:-:) %ctest %{**}
|
|
||||||
|
Loading…
Reference in New Issue
Block a user