diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2015-10-10 18:30:19 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2015-10-10 18:35:30 +0300 |
| commit | 2a97c17549a858ce1beac22777bc0d2f3a535eb8 (patch) | |
| tree | 086cce093fca42afc190fbf882c2e00aac8e0b6f | |
| parent | fd506623d8e299fca2e6fc5960ff0a7927e2c788 (diff) | |
CMake: minor message cleanups.
| -rw-r--r-- | CMakeLists.txt | 6 | ||||
| -rw-r--r-- | build_files/cmake/buildinfo.cmake | 2 | ||||
| -rw-r--r-- | build_files/cmake/packaging.cmake | 2 |
3 files changed, 4 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 029198f7064..1b5a0ed81e5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -532,13 +532,11 @@ if(APPLE) else() set(OSX_SYSTEM unsupported) endif() - message(STATUS "Detected system-version: " ${OSX_SYSTEM}) # workaround for incorrect cmake xcode lookup for developer previews - XCODE_VERSION does not take xcode-select path into accout # but would always look into /Applications/Xcode.app while dev versions are named Xcode<version>-DP<preview_number> execute_process(COMMAND xcode-select --print-path OUTPUT_VARIABLE XCODE_CHECK OUTPUT_STRIP_TRAILING_WHITESPACE) string(REPLACE "/Contents/Developer" "" XCODE_BUNDLE ${XCODE_CHECK}) # truncate to bundlepath in any case - message(STATUS "Xcode-bundle : " ${XCODE_BUNDLE}) if(${CMAKE_GENERATOR} MATCHES "Xcode") @@ -566,8 +564,8 @@ if(APPLE) string(SUBSTRING "${XCODE_VERS_BUILD_NR}" 6 3 XCODE_VERSION) # truncate away build-nr unset(XCODE_VERS_BUILD_NR) endif() - - message(STATUS "Detected Xcode-version: " ${XCODE_VERSION}) + + message(STATUS "Detected OS X ${OSX_SYSTEM} and Xcode ${XCODE_VERSION} at ${XCODE_BUNDLE}") if(${XCODE_VERSION} VERSION_LESS 4.3) set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX${OSX_SYSTEM}.sdk CACHE PATH "" FORCE) # use guaranteed existing sdk diff --git a/build_files/cmake/buildinfo.cmake b/build_files/cmake/buildinfo.cmake index 81b0c1b1e23..d292b35fa65 100644 --- a/build_files/cmake/buildinfo.cmake +++ b/build_files/cmake/buildinfo.cmake @@ -12,7 +12,7 @@ if(EXISTS ${SOURCE_DIR}/.git) # The FindGit.cmake module is part of the standard distribution find_package(Git) if(GIT_FOUND) - message(STATUS "-- Found Git: ${GIT_EXECUTABLE}") + message(STATUS "Found Git: ${GIT_EXECUTABLE}") execute_process(COMMAND git rev-parse --abbrev-ref HEAD WORKING_DIRECTORY ${SOURCE_DIR} diff --git a/build_files/cmake/packaging.cmake b/build_files/cmake/packaging.cmake index f1939cfd474..accec6d6f0d 100644 --- a/build_files/cmake/packaging.cmake +++ b/build_files/cmake/packaging.cmake @@ -23,7 +23,7 @@ set(MY_WC_HASH "unknown") if(EXISTS ${CMAKE_SOURCE_DIR}/.git/) find_package(Git) if(GIT_FOUND) - message(STATUS "-- Found Git: ${GIT_EXECUTABLE}") + message(STATUS "Found Git: ${GIT_EXECUTABLE}") execute_process(COMMAND git rev-parse --short HEAD WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} OUTPUT_VARIABLE MY_WC_HASH |