From a7ac6481ef72d8968445146f348d6d10aa70163e Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 10 Dec 2013 13:18:46 +1100 Subject: CMake: report messages as status (else ccmake treats like an error) --- extern/libmv/third_party/ceres/CMakeLists.txt | 24 ++++++++++++------------ extern/libmv/third_party/ceres/bundle.sh | 24 ++++++++++++------------ 2 files changed, 24 insertions(+), 24 deletions(-) (limited to 'extern') diff --git a/extern/libmv/third_party/ceres/CMakeLists.txt b/extern/libmv/third_party/ceres/CMakeLists.txt index 5a1a2d61c48..52e2246b13f 100644 --- a/extern/libmv/third_party/ceres/CMakeLists.txt +++ b/extern/libmv/third_party/ceres/CMakeLists.txt @@ -329,8 +329,8 @@ if(HAVE_STD_UNORDERED_MAP_HEADER) }" HAVE_UNURDERED_MAP_IN_STD_NAMESPACE) if(HAVE_UNURDERED_MAP_IN_STD_NAMESPACE) - ADD_DEFINITIONS(-DCERES_STD_UNORDERED_MAP) - MESSAGE("-- Found unordered_map/set in std namespace.") + add_definitions(-DCERES_STD_UNORDERED_MAP) + message(STATUS "Found unordered_map/set in std namespace.") else() CHECK_CXX_SOURCE_COMPILES("#include int main() { @@ -339,24 +339,24 @@ if(HAVE_STD_UNORDERED_MAP_HEADER) }" HAVE_UNURDERED_MAP_IN_TR1_NAMESPACE) if(HAVE_UNURDERED_MAP_IN_TR1_NAMESPACE) - ADD_DEFINITIONS(-DCERES_STD_UNORDERED_MAP_IN_TR1_NAMESPACE) - MESSAGE("-- Found unordered_map/set in std::tr1 namespace.") + add_definitions(-DCERES_STD_UNORDERED_MAP_IN_TR1_NAMESPACE) + message(STATUS "Found unordered_map/set in std::tr1 namespace.") else() - MESSAGE("-- Found but cannot find either std::unordered_map " + message(STATUS "Found but cannot find either std::unordered_map " "or std::tr1::unordered_map.") - MESSAGE("-- Replacing unordered_map/set with map/set (warning: slower!)") - ADD_DEFINITIONS(-DCERES_NO_UNORDERED_MAP) + message(STATUS "Replacing unordered_map/set with map/set (warning: slower!)") + add_definitions(-DCERES_NO_UNORDERED_MAP) endif() endif() else() CHECK_INCLUDE_FILE_CXX("tr1/unordered_map" UNORDERED_MAP_IN_TR1_NAMESPACE) if(UNORDERED_MAP_IN_TR1_NAMESPACE) - ADD_DEFINITIONS(-DCERES_TR1_UNORDERED_MAP) - MESSAGE("-- Found unordered_map/set in std::tr1 namespace.") + add_definitions(-DCERES_TR1_UNORDERED_MAP) + message(STATUS "Found unordered_map/set in std::tr1 namespace.") else() - MESSAGE("-- Unable to find or . ") - MESSAGE("-- Replacing unordered_map/set with map/set (warning: slower!)") - ADD_DEFINITIONS(-DCERES_NO_UNORDERED_MAP) + message(STATUS "Unable to find or . ") + message(STATUS "Replacing unordered_map/set with map/set (warning: slower!)") + add_definitions(-DCERES_NO_UNORDERED_MAP) endif() endif() diff --git a/extern/libmv/third_party/ceres/bundle.sh b/extern/libmv/third_party/ceres/bundle.sh index 750575862de..d937ed46945 100755 --- a/extern/libmv/third_party/ceres/bundle.sh +++ b/extern/libmv/third_party/ceres/bundle.sh @@ -194,8 +194,8 @@ if(HAVE_STD_UNORDERED_MAP_HEADER) }" HAVE_UNURDERED_MAP_IN_STD_NAMESPACE) if(HAVE_UNURDERED_MAP_IN_STD_NAMESPACE) - ADD_DEFINITIONS(-DCERES_STD_UNORDERED_MAP) - MESSAGE("-- Found unordered_map/set in std namespace.") + add_definitions(-DCERES_STD_UNORDERED_MAP) + message(STATUS "Found unordered_map/set in std namespace.") else() CHECK_CXX_SOURCE_COMPILES("#include int main() { @@ -204,24 +204,24 @@ if(HAVE_STD_UNORDERED_MAP_HEADER) }" HAVE_UNURDERED_MAP_IN_TR1_NAMESPACE) if(HAVE_UNURDERED_MAP_IN_TR1_NAMESPACE) - ADD_DEFINITIONS(-DCERES_STD_UNORDERED_MAP_IN_TR1_NAMESPACE) - MESSAGE("-- Found unordered_map/set in std::tr1 namespace.") + add_definitions(-DCERES_STD_UNORDERED_MAP_IN_TR1_NAMESPACE) + message(STATUS "Found unordered_map/set in std::tr1 namespace.") else() - MESSAGE("-- Found but cannot find either std::unordered_map " + message(STATUS "Found but cannot find either std::unordered_map " "or std::tr1::unordered_map.") - MESSAGE("-- Replacing unordered_map/set with map/set (warning: slower!)") - ADD_DEFINITIONS(-DCERES_NO_UNORDERED_MAP) + message(STATUS "Replacing unordered_map/set with map/set (warning: slower!)") + add_definitions(-DCERES_NO_UNORDERED_MAP) endif() endif() else() CHECK_INCLUDE_FILE_CXX("tr1/unordered_map" UNORDERED_MAP_IN_TR1_NAMESPACE) if(UNORDERED_MAP_IN_TR1_NAMESPACE) - ADD_DEFINITIONS(-DCERES_TR1_UNORDERED_MAP) - MESSAGE("-- Found unordered_map/set in std::tr1 namespace.") + add_definitions(-DCERES_TR1_UNORDERED_MAP) + message(STATUS "Found unordered_map/set in std::tr1 namespace.") else() - MESSAGE("-- Unable to find or . ") - MESSAGE("-- Replacing unordered_map/set with map/set (warning: slower!)") - ADD_DEFINITIONS(-DCERES_NO_UNORDERED_MAP) + message(STATUS "Unable to find or . ") + message(STATUS "Replacing unordered_map/set with map/set (warning: slower!)") + add_definitions(-DCERES_NO_UNORDERED_MAP) endif() endif() -- cgit v1.2.3