diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-12-10 06:18:46 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-12-10 06:18:46 +0400 |
| commit | a7ac6481ef72d8968445146f348d6d10aa70163e (patch) | |
| tree | 3f5c76e1912bf4770664bdacf469bc1d1d99a441 /extern/libmv/third_party | |
| parent | cc9372b7e0f848405e37d51587916c4ec7f636a3 (diff) | |
CMake: report messages as status (else ccmake treats like an error)
Diffstat (limited to 'extern/libmv/third_party')
| -rw-r--r-- | extern/libmv/third_party/ceres/CMakeLists.txt | 24 | ||||
| -rwxr-xr-x | extern/libmv/third_party/ceres/bundle.sh | 24 |
2 files changed, 24 insertions, 24 deletions
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 <unordered_map> 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 <unordered_map> but cannot find either std::unordered_map " + message(STATUS "Found <unordered_map> 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 <unordered_map> or <tr1/unordered_map>. ") - MESSAGE("-- Replacing unordered_map/set with map/set (warning: slower!)") - ADD_DEFINITIONS(-DCERES_NO_UNORDERED_MAP) + message(STATUS "Unable to find <unordered_map> or <tr1/unordered_map>. ") + 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 <unordered_map> 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 <unordered_map> but cannot find either std::unordered_map " + message(STATUS "Found <unordered_map> 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 <unordered_map> or <tr1/unordered_map>. ") - MESSAGE("-- Replacing unordered_map/set with map/set (warning: slower!)") - ADD_DEFINITIONS(-DCERES_NO_UNORDERED_MAP) + message(STATUS "Unable to find <unordered_map> or <tr1/unordered_map>. ") + message(STATUS "Replacing unordered_map/set with map/set (warning: slower!)") + add_definitions(-DCERES_NO_UNORDERED_MAP) endif() endif() |