testing/cmake
SHA256
3
0
Fork 0
forked from pool/cmake
Code Pull Requests Activity

Accepting request 492803 from devel:tools:building

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/492803
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cmake?expand=0&rev=132
This commit is contained in:
Dominique Leuenberger 2017-06-01 14:16:51 +00:00 committed by Git OBS Bridge
commit 0b9615be9b
13 changed files with 84 additions and 255 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cmake-3.7.2-SHA-256.txt
View File

@ -1,11 +0,0 @@
2d5e2fbdcf01f03c5660823d89e75343cd3f9ba918bc2ca8759e58d5f168614c cmake-3.7.2-Darwin-x86_64.dmg
0175e97748052dfc15ebd3c0aa65286e5ec20ca22ed606ce88940e699496b03c cmake-3.7.2-Darwin-x86_64.tar.gz
2e250d9a23764a9c54262c1ddc275b02666b81e2cbe05459d15906825655874b cmake-3.7.2-Linux-x86_64.sh
0e6ec35d4fa9bf79800118916b51928b6471d5725ff36f1d0de5ebb34dcd5406 cmake-3.7.2-Linux-x86_64.tar.gz
ec44575ff59523d78389565e29ebd58b9b6c10748d94d9b2ff7f4f27a61935a4 cmake-3.7.2-win32-x86.msi
ec5e299d412e0272e01d4de5bf07718f42c96361f83d51cc39f91bf49cc3e5c3 cmake-3.7.2-win32-x86.zip
8b0cbfc6be83e31a058c8ef282fe204862809ffcd8788bc19a8f0eb457f71187 cmake-3.7.2-win64-x64.msi
def3bb81dfd922ce1ea2a0647645eefb60e128d520c8ca707c5996c331bc8b48 cmake-3.7.2-win64-x64.zip
704ed35cad2e999da1cc465170264f2556ec7bf095d24d2788d8d5ed82f12a05 cmake-3.7.2.tar.Z
dc1246c4e6d168ea4d6e042cfba577c1acd65feea27e56f5ff37df920c30cae0 cmake-3.7.2.tar.gz
36672d4fdf01957ab41635689a501bbe280d5cd4475e2736b631d1510cae528c cmake-3.7.2.zip

16
cmake-3.7.2-SHA-256.txt.asc
View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEExsJlMku+vcNQtRPQLSzvEDSSFoQFAlh474YACgkQLSzvEDSS
FoQ3bQ//VfMo3sgI+rds0ah1lEVCEwPw2HmlU6MbH6jUdoxV84paJPZ/YWjEHgPx
+DtmZrC8Al7s0lN/9xHyipEWD+ALXbRijx+/9oM0JoSYmiFH5I+0msas6LshmwDx
AzeEYZ9IT31Wwdja9rfG0QpqwOIbf3Y3RxxjdDFWOwrKG6kc+X+kLmaLXmyrHSAO
XsFqhyDU+EzU1Lig3Cnj7dQOWG2qyBwP4T9GrlOHuMg2MCxDszqKApYrLceg7g2U
b6jcaXfR3k5RFYZ/PsuIdczLUWOmIWlCl4N9HN1HguwityJunzd1HkGSVGHV95KG
xiCLYtsXtk+FNFDKCebSunl8NWrA7yUPlpayx1mnledZN20gCbwLOS+pEKH1OR+s
hbwiwJIb5i900+dJJHBqbPiNIscvGUaAQhP2w1MXBTwhbp5ajFmVfahkvipCFrOB
sCbMk4+Ft/cW8csGWTfj9zwtDMK2Y/T1IShg8suywdYOUSP57V2vr90ryKO+Uxfl
NOMba22Ec4Wi/ZdocT4NlKMiUDpdH/9JgpZ134TqH7FR1Q8VMqlJeRFb7Z3lQvh3
JZNXrRoompKWi2iY1RVssSG2IAE1wN7l4Y2T3ecXTfsIdNCdPNFWtpqdTA2NZZtF
cFLjou6Qgn5WjrluTyeJqS0O8k1FtMIQagEFebKlw5OGEo77zfQ=
=e0Oc
-----END PGP SIGNATURE-----

3
cmake-3.7.2.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:dc1246c4e6d168ea4d6e042cfba577c1acd65feea27e56f5ff37df920c30cae0
size 7361593

11
cmake-3.8.1-SHA-256.txt Normal file
View File

@ -0,0 +1,11 @@
a3ab2fd0249b7964dff2033a1c05726c6117182bfd76c4a0678d7dbb2b108ced cmake-3.8.1-Darwin-x86_64.dmg
cf8cf16eb1281127006507e69bbcfabec2ccbbc3dfb95888c39d578d037569f1 cmake-3.8.1-Darwin-x86_64.tar.gz
cb62a4005ce71010cad8f72016b0e817ce43314d808c1598c335f4eb47b66c20 cmake-3.8.1-Linux-x86_64.sh
10ca0e25b7159a03da0c1ec627e686562dc2a40aad5985fd2088eb684b08e491 cmake-3.8.1-Linux-x86_64.tar.gz
1c1770010fb3beef0247679a383d519b0e46712352f61857493dc572e382f196 cmake-3.8.1-win32-x86.msi
0e9cbf89370440410da8639309053defa44f1ff5cc31476c1fdc8cc0b59604b0 cmake-3.8.1-win32-x86.zip
c2bbf8e86a6b65d02149872361ca9131e78645c0435e21407a75886ac390cd9d cmake-3.8.1-win64-x64.msi
f2abe3d588365d46d84fe05e5644a2d85c981018e98b742ee60a3fc1d818d22b cmake-3.8.1-win64-x64.zip
fe084bdc7f7b549668b380804da20890f136a29dce416bf11183cdebcf4a660b cmake-3.8.1.tar.Z
ce5d9161396e06501b00e52933783150a87c33080d4bdcef461b5b7fd24ac228 cmake-3.8.1.tar.gz
302414a4499fe9a35c358b4034168626913a6da80ea0646a5adf2b3d109c54f1 cmake-3.8.1.zip

16
cmake-3.8.1-SHA-256.txt.asc Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEExsJlMku+vcNQtRPQLSzvEDSSFoQFAlkIjT8ACgkQLSzvEDSS
FoTOCBAAqoxNM33W1mZ8nkNOy04J5IJrjjp9ETvqsnNOlCauPrfgwwpFTEaO1InH
Y4n7S+KCSTiB9HZyLkzJTkg9jZ5SF7ksy2M8AFIvDhh6TR8HiLAMks0Mgnw/UVyV
FWoe5zZAy99EDs4m83C/4/JMxk5vDrIUghlAFtbF1Q7uqdNyNUIQSFEed7qdxIdm
l1Zjod/CK6I89cjvZ3pXcGqjeRUBfjec1vNFYaMthtLi2GKQRZdFd/UMnJfeULcl
5OMcxFYfoldIYaSvXsM7DNw+DEH1DBSpWVSHE269KQCAo0kfn7JqOsWgxEtWHmn6
rC8WuDjIw0EowBo1nVinD1LesQ/aIGCxN6sSi3M8/RSCUWvCoCEn+zlQtGEHmlAn
/rjVpruWqnHusWUJ13O90fdzaZmQkucOOl5eS8Quhqem/teNuCjipjbqzJg+JTME
K+zByTePLiSeyqqFsT8eWNw/zfAGx9dYSxmC+SwblYyj6HuzGbfY9W7PxHR2FjDV
AodkYH3Ao97rEI3xBU2Mb4j9oxEQNr9//A3kcFJwn9g5h4o1KIrqeKKMFO/hP4ys
0EC4QbQ39QDJIQwGhuxaGe4TAuJwu+0CU2kf0S2mgOl7CH0xuOaG64TeEBxeWLQi
g1+pYVzuu9u+6ivxmxkzsRimBS8RznD2HuRhmtxCGmKk24Eod5M=
=LXAa
-----END PGP SIGNATURE-----

3
cmake-3.8.1.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ce5d9161396e06501b00e52933783150a87c33080d4bdcef461b5b7fd24ac228
size 7503955

12
cmake-gui.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Tue May 2 20:57:37 UTC 2017 - foss@grueninger.de
- update to 3.8.1:
* no changes specific to CMake-GUI
-------------------------------------------------------------------
Tue Apr 11 04:55:48 UTC 2017 - foss@grueninger.de
- update to 3.8.0:
* no changes specific to CMake-GUI for Linux
-------------------------------------------------------------------
Sun Jan 15 14:11:33 UTC 2017 - astieger@suse.com

10
cmake-gui.spec
View File

@ -16,16 +16,17 @@
#
%define shortversion 3.8
Name: cmake-gui
Version: 3.7.2
Version: 3.8.1
Release: 0
Summary: CMake graphical user interface
License: BSD-3-Clause
Group: Development/Tools/Building
Url: http://www.cmake.org/
Source0: http://www.cmake.org/files/v3.7/cmake-%{version}.tar.gz
Source5: http://www.cmake.org/files/v3.7/cmake-%{version}-SHA-256.txt
Source6: http://www.cmake.org/files/v3.7/cmake-%{version}-SHA-256.txt.asc
Source0: http://www.cmake.org/files/v%{shortversion}/cmake-%{version}.tar.gz
Source5: http://www.cmake.org/files/v%{shortversion}/cmake-%{version}-SHA-256.txt
Source6: http://www.cmake.org/files/v%{shortversion}/cmake-%{version}-SHA-256.txt.asc
Source7: cmake.keyring
# PATCH-FIX-UPSTREAM form.patch -- set the correct include path for the ncurses includes
Patch4: form.patch
@ -91,6 +92,7 @@ export CXXFLAGS="%{optflags}"
--sphinx-man \
--system-libs \
--no-system-jsoncpp \
--no-system-librhash \
--parallel=0%{jobs} \
--verbose \
--qt-gui \

23
cmake.changes
View File

@ -1,3 +1,26 @@
-------------------------------------------------------------------
Tue May 2 20:58:12 UTC 2017 - foss@grueninger.de
- update to 3.8.1:
* FindOpenSSL: Add more library name alternatives
* FindBoost: Restore tolerance of backslashes in paths
* Tests: Fix FindModulesExecuteAll when KDE4 is installed
* source_group: Fix TREE with root that is not current source dir
* FindMatlab: Add support for Matlab 2017a
-------------------------------------------------------------------
Tue Apr 11 04:56:27 UTC 2017 - foss@grueninger.de
- update to 3.8.0:
* support C#
* support CUDA s a first-class language
* improve try_compile
* improve compile_features
full changelog: https://blog.kitware.com/cmake-3-8-0-available-for-download/
- update system-libs.patch
- drop reproducible.patch and reproducible2.patch which are part
of upstream
-------------------------------------------------------------------
Wed Mar 29 14:59:26 UTC 2017 - bwiedemann@suse.com

16
cmake.spec
View File

@ -16,20 +16,21 @@
#
%define shortversion 3.8
Name: cmake
Version: 3.7.2
Version: 3.8.1
Release: 0
Summary: Cross-platform, open-source make system
License: BSD-3-Clause
Group: Development/Tools/Building
Url: http://www.cmake.org/
Source0: http://www.cmake.org/files/v3.7/%{name}-%{version}.tar.gz
Source0: http://www.cmake.org/files/v%{shortversion}/%{name}-%{version}.tar.gz
Source1: cmake.macros
# bnc#947585 - Let CMake produces automatic RPM provides
Source3: cmake.attr
Source4: cmake.prov
Source5: http://www.cmake.org/files/v3.7/%{name}-%{version}-SHA-256.txt
Source6: http://www.cmake.org/files/v3.7/%{name}-%{version}-SHA-256.txt.asc
Source5: http://www.cmake.org/files/v%{shortversion}/%{name}-%{version}-SHA-256.txt
Source6: http://www.cmake.org/files/v%{shortversion}/%{name}-%{version}-SHA-256.txt.asc
Source7: cmake.keyring
Patch2: cmake-fix-ruby-test.patch
# PATCH-FIX-UPSTREAM form.patch -- set the correct include path for the ncurses includes
@ -38,10 +39,6 @@ Patch4: form.patch
Patch5: system-libs.patch
# PATCH-FIX-UPSTREAM cmake-ImageMagick7.patch -- find also ImageMagick 7
Patch6: cmake-ImageMagick7.patch
# PATCH-FIX-UPSTREAM reproducible.patch -- https://gitlab.kitware.com/cmake/cmake/merge_requests/432
Patch7: reproducible.patch
# PATCH-FIX-UPSTREAM reproducible2.patch -- https://gitlab.kitware.com/cmake/cmake/merge_requests/446
Patch8: reproducible2.patch
BuildRequires: curl-devel
BuildRequires: fdupes
BuildRequires: gcc-c++
@ -82,8 +79,6 @@ echo "`grep %{name}-%{version}.tar.gz %{SOURCE5} | grep -Eo '^[0-9a-f]+'` %{SOU
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
%patch8 -p1
%build
export CFLAGS="%{optflags}"
@ -95,6 +90,7 @@ export CXXFLAGS="%{optflags}"
--docdir=/share/doc/packages/%{name} \
--mandir=/share/man \
--system-libs \
--no-system-librhash \
--no-system-jsoncpp \
--parallel=0%{jobs} \
--verbose \

167
reproducible.patch
View File

@ -1,167 +0,0 @@
commit 243aed525a2fd8e5fe32139fd0f8d0cc0e40cc33
Author: Bernhard M. Wiedemann <bwiedemann@suse.de>
Date: Wed Jan 25 07:15:40 2017 +0100
cmTimestamp: Support SOURCE_DATE_EPOCH to override current time
See https://reproducible-builds.org/ for why this is good and
https://reproducible-builds.org/specs/source-date-epoch/ for the
definition of this variable.
diff --git a/Help/command/string.rst b/Help/command/string.rst
index 77538f6..2c7847a 100644
--- a/Help/command/string.rst
+++ b/Help/command/string.rst
@@ -329,6 +329,12 @@ If no explicit ``<format string>`` is given it will default to:
Write a string which can be used as an identifier in C.
+.. note::
+
+ If the ``SOURCE_DATE_EPOCH`` environment variable is set,
+ its value will be used instead of the current time.
+ See https://reproducible-builds.org/specs/source-date-epoch/ for details.
+
UUID
""""
diff --git a/Help/release/dev/SOURCE_DATE_EPOCH.rst b/Help/release/dev/SOURCE_DATE_EPOCH.rst
new file mode 100644
index 0000000..576e1da
--- /dev/null
+++ b/Help/release/dev/SOURCE_DATE_EPOCH.rst
@@ -0,0 +1,5 @@
+SOURCE_DATE_EPOCH
+-----------------
+
+* The :command:`string(TIMESTAMP)` will now honor the ``SOURCE_DATE_EPOCH``
+ environment variable and use its value instead of the current time.
diff --git a/Source/cmTimestamp.cxx b/Source/cmTimestamp.cxx
index 4a97114..1e5ac5b 100644
--- a/Source/cmTimestamp.cxx
+++ b/Source/cmTimestamp.cxx
@@ -12,6 +13,16 @@ std::string cmTimestamp::CurrentTime(const std::string& formatString,
bool utcFlag)
{
time_t currentTimeT = time(CM_NULLPTR);
+ std::string source_date_epoch;
+ cmSystemTools::GetEnv("SOURCE_DATE_EPOCH", source_date_epoch);
+ if (!source_date_epoch.empty()) {
+ std::istringstream iss(source_date_epoch);
+ iss >> currentTimeT;
+ if (iss.fail() || !iss.eof()) {
+ cmSystemTools::Error("Cannot parse SOURCE_DATE_EPOCH as integer");
+ exit(27);
+ }
+ }
if (currentTimeT == time_t(-1)) {
return std::string();
}
diff --git a/Tests/RunCMake/string/RunCMakeTest.cmake b/Tests/RunCMake/string/RunCMakeTest.cmake
index 8067d9d..38a77b0 100644
--- a/Tests/RunCMake/string/RunCMakeTest.cmake
+++ b/Tests/RunCMake/string/RunCMakeTest.cmake
@@ -6,6 +6,11 @@ run_cmake(AppendNoArgs)
run_cmake(Concat)
run_cmake(ConcatNoArgs)
+run_cmake(Timestamp)
+run_cmake(TimestampEmpty)
+run_cmake(TimestampInvalid)
+run_cmake(TimestampInvalid2)
+
run_cmake(Uuid)
run_cmake(UuidMissingNamespace)
run_cmake(UuidMissingNamespaceValue)
diff --git a/Tests/RunCMake/string/Timestamp-result.txt b/Tests/RunCMake/string/Timestamp-result.txt
new file mode 100644
index 0000000..573541a
--- /dev/null
+++ b/Tests/RunCMake/string/Timestamp-result.txt
@@ -0,0 +1 @@
+0
diff --git a/Tests/RunCMake/string/Timestamp-stderr.txt b/Tests/RunCMake/string/Timestamp-stderr.txt
new file mode 100644
index 0000000..c12b070
--- /dev/null
+++ b/Tests/RunCMake/string/Timestamp-stderr.txt
@@ -0,0 +1 @@
+RESULT=2005-08-07 23:19:49 Sun Aug 05 day=219 wd=0 week=32 %%I=11
diff --git a/Tests/RunCMake/string/Timestamp.cmake b/Tests/RunCMake/string/Timestamp.cmake
new file mode 100644
index 0000000..1232300
--- /dev/null
+++ b/Tests/RunCMake/string/Timestamp.cmake
@@ -0,0 +1,3 @@
+set(ENV{SOURCE_DATE_EPOCH} "1123456789")
+string(TIMESTAMP RESULT "%Y-%m-%d %H:%M:%S %a %b %y day=%j wd=%w week=%U %%I=%I" UTC)
+message("RESULT=${RESULT}")
diff --git a/Tests/RunCMake/string/TimestampEmpty-result.txt b/Tests/RunCMake/string/TimestampEmpty-result.txt
new file mode 100644
index 0000000..573541a
--- /dev/null
+++ b/Tests/RunCMake/string/TimestampEmpty-result.txt
@@ -0,0 +1 @@
+0
diff --git a/Tests/RunCMake/string/TimestampEmpty-stderr.txt b/Tests/RunCMake/string/TimestampEmpty-stderr.txt
new file mode 100644
index 0000000..35cbd3c
--- /dev/null
+++ b/Tests/RunCMake/string/TimestampEmpty-stderr.txt
@@ -0,0 +1 @@
+RESULT=2
diff --git a/Tests/RunCMake/string/TimestampEmpty.cmake b/Tests/RunCMake/string/TimestampEmpty.cmake
new file mode 100644
index 0000000..21b770f
--- /dev/null
+++ b/Tests/RunCMake/string/TimestampEmpty.cmake
@@ -0,0 +1,3 @@
+set(ENV{SOURCE_DATE_EPOCH} "")
+string(TIMESTAMP RESULT "%Y-%m-%d %H:%M:%S" UTC)
+message("RESULT=${RESULT}")
diff --git a/Tests/RunCMake/string/TimestampInvalid-result.txt b/Tests/RunCMake/string/TimestampInvalid-result.txt
new file mode 100644
index 0000000..f64f5d8
--- /dev/null
+++ b/Tests/RunCMake/string/TimestampInvalid-result.txt
@@ -0,0 +1 @@
+27
diff --git a/Tests/RunCMake/string/TimestampInvalid-stderr.txt b/Tests/RunCMake/string/TimestampInvalid-stderr.txt
new file mode 100644
index 0000000..75566da
--- /dev/null
+++ b/Tests/RunCMake/string/TimestampInvalid-stderr.txt
@@ -0,0 +1 @@
+CMake Error: Cannot parse SOURCE_DATE_EPOCH as integer
diff --git a/Tests/RunCMake/string/TimestampInvalid.cmake b/Tests/RunCMake/string/TimestampInvalid.cmake
new file mode 100644
index 0000000..ab36270
--- /dev/null
+++ b/Tests/RunCMake/string/TimestampInvalid.cmake
@@ -0,0 +1,3 @@
+set(ENV{SOURCE_DATE_EPOCH} "invalid-integer")
+string(TIMESTAMP RESULT "%Y-%m-%d %H:%M:%S" UTC)
+message("RESULT=${RESULT}")
diff --git a/Tests/RunCMake/string/TimestampInvalid2-result.txt b/Tests/RunCMake/string/TimestampInvalid2-result.txt
new file mode 100644
index 0000000..f64f5d8
--- /dev/null
+++ b/Tests/RunCMake/string/TimestampInvalid2-result.txt
@@ -0,0 +1 @@
+27
diff --git a/Tests/RunCMake/string/TimestampInvalid2-stderr.txt b/Tests/RunCMake/string/TimestampInvalid2-stderr.txt
new file mode 100644
index 0000000..75566da
--- /dev/null
+++ b/Tests/RunCMake/string/TimestampInvalid2-stderr.txt
@@ -0,0 +1 @@
+CMake Error: Cannot parse SOURCE_DATE_EPOCH as integer
diff --git a/Tests/RunCMake/string/TimestampInvalid2.cmake b/Tests/RunCMake/string/TimestampInvalid2.cmake
new file mode 100644
index 0000000..5cc61b8
--- /dev/null
+++ b/Tests/RunCMake/string/TimestampInvalid2.cmake
@@ -0,0 +1,3 @@
+set(ENV{SOURCE_DATE_EPOCH} "123trailing-garbage")
+string(TIMESTAMP RESULT "%Y-%m-%d %H:%M:%S" UTC)
+message("RESULT=${RESULT}")

37
reproducible2.patch
View File

@ -1,37 +0,0 @@
commit 5181f1f86a4d4c2ac09a540285c938fe2c2fa262
Author: Bernhard M. Wiedemann <bwiedemann@suse.de>
Date: Sun Jan 29 11:52:55 2017 +0100
Tests: make tests pass with SOURCE_DATE_EPOCH set
Fix tests to account for commit 243aed52 (cmTimestamp: Support
SOURCE_DATE_EPOCH to override current time, 2017-01-25).
In openSUSE we are running the test-suite as part of the build and that
failed in these two places when building everything with
`SOURCE_DATE_EPOCH` set.
diff --git a/Tests/CMakeTests/File-TIMESTAMP-NotBogus.cmake b/Tests/CMakeTests/File-TIMESTAMP-NotBogus.cmake
index d0e5fe3..f1aa390 100644
--- a/Tests/CMakeTests/File-TIMESTAMP-NotBogus.cmake
+++ b/Tests/CMakeTests/File-TIMESTAMP-NotBogus.cmake
@@ -1,6 +1,7 @@
set(STAMP_FILENAME "${CMAKE_CURRENT_BINARY_DIR}/FileTimestamp-Stamp")
set(STAMP_FORMAT "%Y-%m-%d")
+unset(ENV{SOURCE_DATE_EPOCH})
string(TIMESTAMP timestamp1 "${STAMP_FORMAT}")
file(WRITE "${STAMP_FILENAME}" "foo")
diff --git a/Tests/CTestTestStopTime/GetDate.cmake b/Tests/CTestTestStopTime/GetDate.cmake
index 1f4cb24..46ab2fb 100644
--- a/Tests/CTestTestStopTime/GetDate.cmake
+++ b/Tests/CTestTestStopTime/GetDate.cmake
@@ -49,6 +49,7 @@ macro(GET_DATE)
# 01/12/2006 08:55:12
# mm/dd/YYYY HH:MM:SS
#
+ unset(ENV{SOURCE_DATE_EPOCH})
string(TIMESTAMP "${GD_PREFIX}OV" "%m/%d/%Y %H:%M:%S")
if(${GD_PREFIX}VERBOSE)

14
system-libs.patch
View File

@ -1,15 +1,15 @@
--- cmake-3.5.0/bootstrap.old 2016-03-08 15:36:25.000000000 +0100
+++ cmake-3.5.0/bootstrap 2016-03-08 23:02:06.663484353 +0100
@@ -634,10 +634,10 @@
--- cmake-3.5.0/bootstrap.old
+++ cmake-3.5.0/bootstrap
@@ -724,10 +724,10 @@
--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-zlib|--system-liblzma)
+ --system-bzip2|--system-curl|--system-expat|--system-form|--system-jsoncpp|--system-libarchive|--system-zlib|--system-liblzma)
- --system-bzip2|--system-curl|--system-expat|--system-jsoncpp|--system-libarchive|--system-librhash|--system-zlib|--system-liblzma)
+ --system-bzip2|--system-curl|--system-expat|--system-from|--system-jsoncpp|--system-libarchive|--system-librhash|--system-zlib|--system-liblzma)
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-zlib|--no-system-liblzma)
+ --no-system-bzip2|--no-system-curl|--no-system-expat|--no-system-form|--no-system-jsoncpp|--no-system-libarchive|--no-system-zlib|--no-system-liblzma)
- --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-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)
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" ;;