[Cmake-commits] CMake branch, next, updated. v2.8.5-1559-ga118650
Alexander Neundorf
neundorf at kde.org
Mon Aug 15 18:39:13 EDT 2011
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via a118650aaf509cdf44ded0405c22203f47422c49 (commit)
via ec6982dc8cad04c72a6ab78b7f115ece65e812bd (commit)
via e552ae7cfd8d6b3dce51f61258ce4854db7c7fbc (commit)
via e589589ab18daabc863061fac515adc2b1ae8d55 (commit)
via aecfc1fd1045fef4af58a16782c2272dd5825aa5 (commit)
from 6e5d7869eb78b26d35405857d5351b294e6303d5 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a118650aaf509cdf44ded0405c22203f47422c49
commit a118650aaf509cdf44ded0405c22203f47422c49
Merge: 6e5d786 ec6982d
Author: Alexander Neundorf <neundorf at kde.org>
AuthorDate: Mon Aug 15 18:39:11 2011 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Aug 15 18:39:11 2011 -0400
Merge topic 'UsingCMakeLikePkgConfig2' into next
ec6982d Disable any STATUS output in --find-package mode
e552ae7 Dont check for -isysroot and -mmacosx-version on OSX in --find-package mode
e589589 Rename helper macros print_compile_flags() to set_compile_flags_var()
aecfc1f Fix test on OpenBSD with BSD make
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ec6982dc8cad04c72a6ab78b7f115ece65e812bd
commit ec6982dc8cad04c72a6ab78b7f115ece65e812bd
Author: Alex Neundorf <neundorf at kde.org>
AuthorDate: Tue Aug 16 00:40:59 2011 +0200
Commit: Alex Neundorf <neundorf at kde.org>
CommitDate: Tue Aug 16 00:40:59 2011 +0200
Disable any STATUS output in --find-package mode
Any STATUS output will be fed directly to the compiler, which
will not understand any status messages. Error messages
are fine, since they are errors and it is ok if the compiler
fails in such cases.
Alex
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 3329a2c..b94db48 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -3022,8 +3022,15 @@ cmCacheManager *cmMakefile::GetCacheManager() const
void cmMakefile::DisplayStatus(const char* message, float s)
{
- this->GetLocalGenerator()->GetGlobalGenerator()
- ->GetCMakeInstance()->UpdateProgress(message, s);
+ cmake* cm = this->GetLocalGenerator()->GetGlobalGenerator()
+ ->GetCMakeInstance();
+ if (cm->GetWorkingMode() == cmake::FIND_PACKAGE_MODE)
+ {
+ // don't output any STATUS message in FIND_PACKAGE_MODE, since they will
+ // directly be fed to the compiler, which will be confused.
+ return;
+ }
+ cm->UpdateProgress(message, s);
}
std::string cmMakefile::GetModulesFile(const char* filename)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e552ae7cfd8d6b3dce51f61258ce4854db7c7fbc
commit e552ae7cfd8d6b3dce51f61258ce4854db7c7fbc
Author: Alex Neundorf <neundorf at kde.org>
AuthorDate: Tue Aug 16 00:30:07 2011 +0200
Commit: Alex Neundorf <neundorf at kde.org>
CommitDate: Tue Aug 16 00:30:51 2011 +0200
Dont check for -isysroot and -mmacosx-version on OSX in --find-package mode
Alex
diff --git a/Modules/CMakeFindPackageMode.cmake b/Modules/CMakeFindPackageMode.cmake
index e4d085d..a8674aa 100644
--- a/Modules/CMakeFindPackageMode.cmake
+++ b/Modules/CMakeFindPackageMode.cmake
@@ -40,6 +40,12 @@ endif()
include(CMakeDetermineSystem)
+# short-cut some tests on Darwin, see Darwin-GNU.cmake:
+if("${CMAKE_SYSTEM_NAME}" MATCHES Darwin AND "${COMPILER_ID}" MATCHES GNU)
+ set(${CMAKE_${LANGUAGE}_HAS_ISYSROOT} 0 )
+ set(CMAKE_${lang}_OSX_DEPLOYMENT_TARGET_FLAG "")
+endif()
+
# Also load the system specific file, which sets up e.g. the search paths.
# This makes the FIND_XXX() calls work much better
include(CMakeSystemSpecificInformation)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e589589ab18daabc863061fac515adc2b1ae8d55
commit e589589ab18daabc863061fac515adc2b1ae8d55
Author: Alex Neundorf <neundorf at kde.org>
AuthorDate: Tue Aug 16 00:22:17 2011 +0200
Commit: Alex Neundorf <neundorf at kde.org>
CommitDate: Tue Aug 16 00:22:17 2011 +0200
Rename helper macros print_compile_flags() to set_compile_flags_var()
The same for print_link_flags(), it is now set_link_flags_var().
Both macros don't print anything anymore, this was only in the
beginning.
Alex
diff --git a/Modules/CMakeFindPackageMode.cmake b/Modules/CMakeFindPackageMode.cmake
index 2ce4fe6..e4d085d 100644
--- a/Modules/CMakeFindPackageMode.cmake
+++ b/Modules/CMakeFindPackageMode.cmake
@@ -84,7 +84,7 @@ set(CMAKE_${LANGUAGE}_COMPILER_ID "${COMPILER_ID}")
include(CMake${LANGUAGE}Information)
-function(print_compile_flags _packageName)
+function(set_compile_flags_var _packageName)
string(TOUPPER "${_packageName}" PACKAGE_NAME)
# Check the following variables:
# FOO_INCLUDE_DIRS
@@ -125,7 +125,7 @@ function(print_compile_flags _packageName)
endfunction()
-function(print_link_flags _packageName)
+function(set_link_flags_var _packageName)
string(TOUPPER "${_packageName}" PACKAGE_NAME)
# Check the following variables:
# FOO_LIBRARIES
@@ -160,9 +160,9 @@ if(${NAME}_FOUND OR ${UPPERCASE_NAME}_FOUND)
if("${MODE}" STREQUAL "EXIST")
# do nothing
elseif("${MODE}" STREQUAL "COMPILE")
- print_compile_flags(${NAME})
+ set_compile_flags_var(${NAME})
elseif("${MODE}" STREQUAL "LINK")
- print_link_flags(${NAME})
+ set_link_flags_var(${NAME})
else("${MODE}" STREQUAL "LINK")
message(FATAL_ERROR "Invalid mode argument ${MODE} given.")
endif()
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=aecfc1fd1045fef4af58a16782c2272dd5825aa5
commit aecfc1fd1045fef4af58a16782c2272dd5825aa5
Author: Alex Neundorf <neundorf at kde.org>
AuthorDate: Tue Aug 16 00:08:43 2011 +0200
Commit: Alex Neundorf <neundorf at kde.org>
CommitDate: Tue Aug 16 00:08:43 2011 +0200
Fix test on OpenBSD with BSD make
BSD make doesn't seem to support -C, so do not use it,
According to the documentation the working directory is set
to CMAKE_CURRENT_BINARY_DIR anyway, so it should work just the same.
Alex
diff --git a/Tests/FindPackageModeMakefileTest/CMakeLists.txt b/Tests/FindPackageModeMakefileTest/CMakeLists.txt
index f0faab9..d2c6be9 100644
--- a/Tests/FindPackageModeMakefileTest/CMakeLists.txt
+++ b/Tests/FindPackageModeMakefileTest/CMakeLists.txt
@@ -15,7 +15,7 @@ if("${CMAKE_CXX_COMPILER_ID}" MATCHES GNU
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Makefile.in ${CMAKE_CURRENT_BINARY_DIR}/ConfMakefile @ONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/main.cpp ${CMAKE_CURRENT_BINARY_DIR}/main.cpp COPYONLY)
- add_test(FindPackageModeMakefileTest ${CMAKE_MAKE_PROGRAM} -f ${CMAKE_CURRENT_BINARY_DIR}/ConfMakefile -C ${CMAKE_CURRENT_BINARY_DIR} )
+ add_test(FindPackageModeMakefileTest ${CMAKE_MAKE_PROGRAM} -f ${CMAKE_CURRENT_BINARY_DIR}/ConfMakefile )
endif()
-----------------------------------------------------------------------
Summary of changes:
Modules/CMakeFindPackageMode.cmake | 14 ++++++++++----
Source/cmMakefile.cxx | 11 +++++++++--
Tests/FindPackageModeMakefileTest/CMakeLists.txt | 2 +-
3 files changed, 20 insertions(+), 7 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list