Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2013-12-10 06:18:46 +0400
committerCampbell Barton <ideasman42@gmail.com>2013-12-10 06:18:46 +0400
commita7ac6481ef72d8968445146f348d6d10aa70163e (patch)
tree3f5c76e1912bf4770664bdacf469bc1d1d99a441
parentcc9372b7e0f848405e37d51587916c4ec7f636a3 (diff)
CMake: report messages as status (else ccmake treats like an error)
-rw-r--r--build_files/cmake/buildinfo.cmake2
-rw-r--r--build_files/cmake/packaging.cmake2
-rw-r--r--extern/libmv/third_party/ceres/CMakeLists.txt24
-rwxr-xr-xextern/libmv/third_party/ceres/bundle.sh24
4 files changed, 26 insertions, 26 deletions
diff --git a/build_files/cmake/buildinfo.cmake b/build_files/cmake/buildinfo.cmake
index fc5cb017283..9b8f93584b8 100644
--- a/build_files/cmake/buildinfo.cmake
+++ b/build_files/cmake/buildinfo.cmake
@@ -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}
diff --git a/build_files/cmake/packaging.cmake b/build_files/cmake/packaging.cmake
index 14848365f2c..ad309b0a0c8 100644
--- a/build_files/cmake/packaging.cmake
+++ b/build_files/cmake/packaging.cmake
@@ -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
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()