CMake: report messages as status (else ccmake treats like an error)
authorCampbell Barton <ideasman42@gmail.com>
Tue, 10 Dec 2013 02:18:46 +0000 (13:18 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 10 Dec 2013 02:18:46 +0000 (13:18 +1100)
build_files/cmake/buildinfo.cmake
build_files/cmake/packaging.cmake
extern/libmv/third_party/ceres/CMakeLists.txt
extern/libmv/third_party/ceres/bundle.sh

index fc5cb0172830317ab6ad34fa354051853ce9711e..9b8f93584b8ebad1a0edd76e0c65bec0ba103acc 100644 (file)
@@ -12,7 +12,7 @@ if(EXISTS ${SOURCE_DIR}/.git)
        # The FindGit.cmake module is part of the standard distribution
        include(FindGit)
        if(GIT_FOUND)
-               message("-- Found Git: ${GIT_EXECUTABLE}")
+               message(STATUS "-- Found Git: ${GIT_EXECUTABLE}")
 
                execute_process(COMMAND git rev-parse --short @{u}
                                WORKING_DIRECTORY ${SOURCE_DIR}
index 14848365f2c258cf65d2e7520aff3a031da7314f..ad309b0a0c8b264b63b89b22c394a09fd3ea22cd 100644 (file)
@@ -24,7 +24,7 @@ set(MY_WC_HASH "unknown")
 if(EXISTS ${CMAKE_SOURCE_DIR}/.git/)
        include(FindGit)
        if(GIT_FOUND)
-               message("-- Found Git: ${GIT_EXECUTABLE}")
+               message(STATUS "-- Found Git: ${GIT_EXECUTABLE}")
                execute_process(COMMAND git rev-parse --short @{u}
                                WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
                                OUTPUT_VARIABLE MY_WC_HASH
index 5a1a2d61c481721609f518a222b396a1a1528840..52e2246b13f14d7b59a8475b007cfc5f22d3cb46 100644 (file)
@@ -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()
 
index 750575862de82b37aa00ee10533b3f91113169d9..d937ed469450a5ed874bab65ec047db2fc1bdc1c 100755 (executable)
@@ -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()