forked from pool/cmake
Simon Lees
d5bef0d9a7
- Update to 3.11.1 * No changes specific to CMake-GUI - update to 3.11.1 * Revert "CheckIncludeFiles: Honor CMAKE_REQUIRED_LIBRARIES" * Restore support for explicitly referenced CMakeLists.txt sources * Exclude "libgcc_eh" library files from implicit link libraries full changelog https://cmake.org/cmake/help/v3.11/release/3.11.html#id1 - Adapted system-libs.patch OBS-URL: https://build.opensuse.org/request/show/605949 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=321
18 lines
1.4 KiB
Diff
18 lines
1.4 KiB
Diff
Index: b/bootstrap
|
|
===================================================================
|
|
--- a/bootstrap
|
|
+++ b/bootstrap
|
|
@@ -803,10 +803,10 @@ while test $# != 0; do
|
|
--init=*) cmake_init_file=`cmake_arg "$1"` ;;
|
|
--system-libs) cmake_bootstrap_system_libs="${cmake_bootstrap_system_libs} -DCMAKE_USE_SYSTEM_LIBRARIES=1" ;;
|
|
--no-system-libs) cmake_bootstrap_system_libs="${cmake_bootstrap_system_libs} -DCMAKE_USE_SYSTEM_LIBRARIES=0" ;;
|
|
- --system-bzip2|--system-curl|--system-expat|--system-jsoncpp|--system-libarchive|--system-librhash|--system-zlib|--system-liblzma|--system-libuv)
|
|
+ --system-bzip2|--system-curl|--system-expat|--system-from|--system-jsoncpp|--system-libarchive|--system-librhash|--system-zlib|--system-liblzma|--system-libuv)
|
|
lib=`cmake_arg "$1" "--system-"`
|
|
cmake_bootstrap_system_libs="${cmake_bootstrap_system_libs} -DCMAKE_USE_SYSTEM_LIBRARY_`cmake_toupper $lib`=1" ;;
|
|
- --no-system-bzip2|--no-system-curl|--no-system-expat|--no-system-jsoncpp|--no-system-libarchive|--no-system-librhash|--no-system-zlib|--no-system-liblzma|--no-system-libuv)
|
|
+ --no-system-bzip2|--no-system-curl|--no-system-expat|--no-system-form|--no-system-jsoncpp|--no-system-libarchive|--no-system-librhash|--no-system-zlib|--no-system-liblzma|--no-system-libuv)
|
|
lib=`cmake_arg "$1" "--no-system-"`
|
|
cmake_bootstrap_system_libs="${cmake_bootstrap_system_libs} -DCMAKE_USE_SYSTEM_LIBRARY_`cmake_toupper $lib`=0" ;;
|
|
--qt-gui) cmake_bootstrap_qt_gui="1" ;;
|