diff options
| -rw-r--r-- | Source/CMakeVersion.cmake | 2 | ||||
| -rw-r--r-- | Tests/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | Tests/QtAutogen/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | Tests/QtAutogen/mocPlugin/CMakeLists.txt | 1 | ||||
| -rwxr-xr-x | bootstrap | 50 |
5 files changed, 7 insertions, 55 deletions
diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index ea98a62..918e6b0 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -1,5 +1,5 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 8) -set(CMake_VERSION_PATCH 20170530) +set(CMake_VERSION_PATCH 20170531) #set(CMake_VERSION_RC 1) diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 335267a..21fe641 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -1728,6 +1728,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release if(CMake_TEST_XCODE_VERSION AND NOT CMake_TEST_XCODE_VERSION VERSION_LESS 5 AND OSX_VERSION MATCHES "^([0-9]+\\.[0-9]+)") + set(XCTest_CTEST_OPTIONS --build-config $<CONFIGURATION>) set(XCTest_BUILD_OPTIONS -DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_MATCH_1} -DCMAKE_OSX_SYSROOT=macosx) ADD_TEST_MACRO(XCTest ${CMAKE_CTEST_COMMAND} -C $<CONFIGURATION> -V) endif() diff --git a/Tests/QtAutogen/CMakeLists.txt b/Tests/QtAutogen/CMakeLists.txt index 101b396..073c5fd 100644 --- a/Tests/QtAutogen/CMakeLists.txt +++ b/Tests/QtAutogen/CMakeLists.txt @@ -304,10 +304,10 @@ if (NOT QT_TEST_VERSION STREQUAL 4) set(timeformat "%Y%j%H%M%S") set(mocPlugSrcDir "${CMAKE_CURRENT_SOURCE_DIR}/mocPlugin") set(mocPlugBinDir "${CMAKE_CURRENT_BINARY_DIR}/mocPlugin") - find_library(plAFile "PlugA" PATHS "${mocPlugBinDir}" NO_DEFAULT_PATH) - find_library(plBFile "PlugB" PATHS "${mocPlugBinDir}" NO_DEFAULT_PATH) - find_library(plCFile "PlugC" PATHS "${mocPlugBinDir}" NO_DEFAULT_PATH) - find_library(plDFile "PlugD" PATHS "${mocPlugBinDir}" NO_DEFAULT_PATH) + find_library(plAFile "PlugA" PATHS "${mocPlugBinDir}/Debug" "${mocPlugBinDir}" NO_DEFAULT_PATH) + find_library(plBFile "PlugB" PATHS "${mocPlugBinDir}/Debug" "${mocPlugBinDir}" NO_DEFAULT_PATH) + find_library(plCFile "PlugC" PATHS "${mocPlugBinDir}/Debug" "${mocPlugBinDir}" NO_DEFAULT_PATH) + find_library(plDFile "PlugD" PATHS "${mocPlugBinDir}/Debug" "${mocPlugBinDir}" NO_DEFAULT_PATH) file(TIMESTAMP "${plAFile}" plABefore "${timeformat}") file(TIMESTAMP "${plBFile}" plBBefore "${timeformat}") diff --git a/Tests/QtAutogen/mocPlugin/CMakeLists.txt b/Tests/QtAutogen/mocPlugin/CMakeLists.txt index 4843c21..f80aa29 100644 --- a/Tests/QtAutogen/mocPlugin/CMakeLists.txt +++ b/Tests/QtAutogen/mocPlugin/CMakeLists.txt @@ -1,4 +1,5 @@ cmake_minimum_required(VERSION 3.8) +project(mocPlugin CXX) set(CMAKE_AUTOMOC_DEPEND_FILTERS "A_CUSTOM_MACRO" @@ -1111,56 +1111,6 @@ rm -f "${TMPFILE}.cxx" if [ "x${cmake_cxx_compiler_is_gnu}" != "x1" ]; then # Check for non-GNU compiler flags - # If we are on OSF, check for -timplicit_local -no_implicit_include - cmake_test_flags="-timplicit_local -no_implicit_include" - if [ "x${cmake_system}" = "xOSF1" ]; then - TMPFILE=`cmake_tmp_file` - echo ' - #include <iostream> - int main() { std::cout << "We need '"${cmake_test_flags}"'" << std::endl; return 0;} -' > ${TMPFILE}.cxx - cmake_need_flags=1 - if cmake_try_run "${cmake_cxx_compiler}" \ - "${cmake_cxx_flags} ${cmake_test_flags}" "${TMPFILE}.cxx" >> cmake_bootstrap.log 2>&1; then - : - else - cmake_need_flags=0 - fi - if [ "x${cmake_need_flags}" = "x1" ]; then - cmake_cxx_flags="${cmake_cxx_flags} ${cmake_test_flags}" - echo "${cmake_cxx_compiler} needs ${cmake_test_flags}" - else - echo "${cmake_cxx_compiler} does not need ${cmake_test_flags}" - fi - rm -f "${TMPFILE}.cxx" - fi - cmake_test_flags= - - # If we are on OSF, check for -std strict_ansi -nopure_cname - cmake_test_flags="-std strict_ansi -nopure_cname" - if [ "x${cmake_system}" = "xOSF1" ]; then - TMPFILE=`cmake_tmp_file` - echo ' - #include <iostream> - int main() { std::cout << "We need '"${cmake_test_flags}"'" << std::endl; return 0;} -' > ${TMPFILE}.cxx - cmake_need_flags=1 - if cmake_try_run "${cmake_cxx_compiler}" \ - "${cmake_cxx_flags} ${cmake_test_flags}" "${TMPFILE}.cxx" >> cmake_bootstrap.log 2>&1; then - : - else - cmake_need_flags=0 - fi - if [ "x${cmake_need_flags}" = "x1" ]; then - cmake_cxx_flags="${cmake_cxx_flags} ${cmake_test_flags}" - echo "${cmake_cxx_compiler} needs ${cmake_test_flags}" - else - echo "${cmake_cxx_compiler} does not need ${cmake_test_flags}" - fi - rm -f "${TMPFILE}.cxx" - fi - cmake_test_flags= - # If we are on HP-UX, check for -Ae for the C compiler. if [ "x${cmake_system}" = "xHP-UX" ]; then cmake_test_flags="-Ae" |