diff options
| author | Brad King <brad.king@kitware.com> | 2017-06-01 17:34:11 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-06-01 17:35:33 (GMT) |
| commit | 4b31267abfab1378e61b8406c9270284857810c1 (patch) | |
| tree | 458f9a58498cfed3d7de1fe62049ce99a6f83d5f | |
| parent | 987216062e8718e0c37970c7ea595703057ce344 (diff) | |
| parent | 9bb8b88904bcdd02fae883808f1b60468b1ec01c (diff) | |
| download | CMake-4b31267abfab1378e61b8406c9270284857810c1.zip CMake-4b31267abfab1378e61b8406c9270284857810c1.tar.gz CMake-4b31267abfab1378e61b8406c9270284857810c1.tar.bz2 | |
Merge topic 'rel-no-bootstrap-test'
9bb8b889 Utilities/Release: Skip BootstrapTest for Linux binary
ff77f461 Utilities/Release: Drop unused release script
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !917
| -rw-r--r-- | Utilities/Release/hythloth_release.cmake | 10 | ||||
| -rw-r--r-- | Utilities/Release/linux64_release.cmake | 1 |
2 files changed, 1 insertions, 10 deletions
diff --git a/Utilities/Release/hythloth_release.cmake b/Utilities/Release/hythloth_release.cmake deleted file mode 100644 index d2f4ba5..0000000 --- a/Utilities/Release/hythloth_release.cmake +++ /dev/null @@ -1,10 +0,0 @@ -set(PROCESSORS 2) -set(HOST hythloth) -set(MAKE_PROGRAM "make") -set(MAKE "${MAKE_PROGRAM} -j2") -set(INITIAL_CACHE " -CMAKE_BUILD_TYPE:STRING=Release -CMAKE_SKIP_BOOTSTRAP_TEST:STRING=TRUE -") -get_filename_component(path "${CMAKE_CURRENT_LIST_FILE}" PATH) -include(${path}/release_cmake.cmake) diff --git a/Utilities/Release/linux64_release.cmake b/Utilities/Release/linux64_release.cmake index feba2a5..3d8ddba 100644 --- a/Utilities/Release/linux64_release.cmake +++ b/Utilities/Release/linux64_release.cmake @@ -35,6 +35,7 @@ OPENSSL_SSL_LIBRARY:FILEPATH=/home/kitware/openssl-1.0.2j/lib/libssl.a PYTHON_EXECUTABLE:FILEPATH=/usr/bin/python3 CPACK_SYSTEM_NAME:STRING=Linux-x86_64 BUILD_QtDialog:BOOL:=TRUE +CMAKE_SKIP_BOOTSTRAP_TEST:STRING=TRUE CMake_ENABLE_SERVER_MODE:BOOL=TRUE CMake_GUI_DISTRIBUTE_WITH_Qt_LGPL:STRING=3 CMake_INSTALL_DEPENDENCIES:BOOL=ON |