diff options
| -rw-r--r-- | Tests/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | Utilities/Release/create-cmake-release.cmake | 8 | ||||
| -rw-r--r-- | Utilities/Release/cygwin_release.cmake (renamed from Utilities/Release/dash2win64_cygwin.cmake) | 1 | ||||
| -rw-r--r-- | Utilities/Release/linux32_release.cmake (renamed from Utilities/Release/magrathea_release.cmake) | 0 | ||||
| -rw-r--r-- | Utilities/Release/osx_release.cmake (renamed from Utilities/Release/bigmac_release.cmake) | 0 | ||||
| -rw-r--r-- | Utilities/Release/win32_release.cmake (renamed from Utilities/Release/dash3win7_release.cmake) | 0 |
6 files changed, 8 insertions, 9 deletions
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 76ea5b4..c14008f 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -684,12 +684,12 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release endif() endmacro() if(CMAKE_BUILD_NIGHTLY_RELEASES) - ADD_NIGHTLY_BUILD_TEST(CMakeNightlyWindows - dash3win7_release.cmake) + ADD_NIGHTLY_BUILD_TEST(CMakeNightlyWin32 + win32_release.cmake) ADD_NIGHTLY_BUILD_TEST(CMakeNightlyOSX - bigmac_release.cmake) + osx_release.cmake) ADD_NIGHTLY_BUILD_TEST(CMakeNightlyLinux32 - magrathea_release.cmake) + linux32_release.cmake) ADD_NIGHTLY_BUILD_TEST(CMakeNightlyLinux64 linux64_release.cmake) endif() diff --git a/Utilities/Release/create-cmake-release.cmake b/Utilities/Release/create-cmake-release.cmake index 403367b..f440519 100644 --- a/Utilities/Release/create-cmake-release.cmake +++ b/Utilities/Release/create-cmake-release.cmake @@ -6,14 +6,14 @@ endif() file(MAKE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/logs) set(RELEASE_SCRIPTS_BATCH_1 - dash3win7_release.cmake # Windows - bigmac_release.cmake # OS X x86_64 - magrathea_release.cmake # Linux + win32_release.cmake # Windows x86 + osx_release.cmake # OS X x86_64 + linux32_release.cmake # Linux x86 linux64_release.cmake # Linux x86_64 ) set(RELEASE_SCRIPTS_BATCH_2 - dash2win64_cygwin.cmake # Cygwin + cygwin_release.cmake # Cygwin x86 ) function(write_batch_shell_script filename) diff --git a/Utilities/Release/dash2win64_cygwin.cmake b/Utilities/Release/cygwin_release.cmake index ca590ed..ca3e794 100644 --- a/Utilities/Release/dash2win64_cygwin.cmake +++ b/Utilities/Release/cygwin_release.cmake @@ -17,7 +17,6 @@ CMake_INSTALL_DEPENDENCIES:BOOL=ON ") set(CXX g++) set(CC gcc) -set(SCRIPT_NAME dash2win64cygwin) set(GIT_EXTRA "git config core.autocrlf false") get_filename_component(path "${CMAKE_CURRENT_LIST_FILE}" PATH) diff --git a/Utilities/Release/magrathea_release.cmake b/Utilities/Release/linux32_release.cmake index 00abcc1..00abcc1 100644 --- a/Utilities/Release/magrathea_release.cmake +++ b/Utilities/Release/linux32_release.cmake diff --git a/Utilities/Release/bigmac_release.cmake b/Utilities/Release/osx_release.cmake index 568a98c..568a98c 100644 --- a/Utilities/Release/bigmac_release.cmake +++ b/Utilities/Release/osx_release.cmake diff --git a/Utilities/Release/dash3win7_release.cmake b/Utilities/Release/win32_release.cmake index f25d638..f25d638 100644 --- a/Utilities/Release/dash3win7_release.cmake +++ b/Utilities/Release/win32_release.cmake |