forked from bartvdbraak/blender
CMake: report messages as status (else ccmake treats like an error)
This commit is contained in:
parent
cc9372b7e0
commit
a7ac6481ef
@ -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}
|
||||
|
@ -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
|
||||
|
24
extern/libmv/third_party/ceres/CMakeLists.txt
vendored
24
extern/libmv/third_party/ceres/CMakeLists.txt
vendored
@ -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()
|
||||
|
||||
|
24
extern/libmv/third_party/ceres/bundle.sh
vendored
24
extern/libmv/third_party/ceres/bundle.sh
vendored
@ -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()
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user