diff options
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | build_files/cmake/macros.cmake | 26 | ||||
| -rw-r--r-- | source/blender/makesdna/intern/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | source/blenderplayer/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | source/creator/CMakeLists.txt | 7 |
6 files changed, 29 insertions, 21 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 2ac45e47486..89ee0707280 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1026,6 +1026,9 @@ if(WITH_ASSERT_ABORT) add_definitions(-DWITH_ASSERT_ABORT) endif() +# message(STATUS "Using CFLAGS: ${CMAKE_C_FLAGS}") +# message(STATUS "Using CXXFLAGS: ${CMAKE_CXX_FLAGS}") + #----------------------------------------------------------------------------- # Libraries diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake index a246a81a545..b1428cdf131 100644 --- a/build_files/cmake/macros.cmake +++ b/build_files/cmake/macros.cmake @@ -5,7 +5,7 @@ macro(blenderlib_nolist sources includes) - message(STATUS "Configuring library ${name}") + # message(STATUS "Configuring library ${name}") include_directories(${includes}) add_library(${name} ${sources}) @@ -205,7 +205,7 @@ endmacro() macro(TEST_SSE_SUPPORT) include(CheckCSourceRuns) - message(STATUS "Detecting SSE support") + # message(STATUS "Detecting SSE support") if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX) set(CMAKE_REQUIRED_FLAGS "-msse -msse2") elseif(MSVC) @@ -221,18 +221,18 @@ macro(TEST_SSE_SUPPORT) #include <emmintrin.h> int main() { __m128d v = _mm_setzero_pd(); return 0; }" SUPPORT_SSE2_BUILD) - message(STATUS "Detecting SSE support") + # message(STATUS "Detecting SSE support") if(SUPPORT_SSE_BUILD) - message(STATUS " ...SSE support found.") + message(STATUS "SSE Support: detected.") else() - message(STATUS " ...SSE support missing.") + message(STATUS "SSE Support: missing.") endif() if(SUPPORT_SSE2_BUILD) - message(STATUS " ...SSE2 support found.") + message(STATUS "SSE2 Support: detected.") else() - message(STATUS " ...SSE2 support missing.") + message(STATUS "SSE2 Support: missing.") endif() endmacro() @@ -284,8 +284,8 @@ macro(ADD_CHECK_C_COMPILER_FLAG CHECK_C_COMPILER_FLAG(${_FLAG} SUPPORT_WALL) if(SUPPORT_WALL) - message(STATUS "Using CFLAG: ${_FLAG}") - set(_CFLAGS "${_CFLAGS} ${_FLAG}") + # message(STATUS "Using CFLAG: ${_FLAG}") + set(${_CFLAGS} "${${_CFLAGS}} ${_FLAG}") else() message(STATUS "Unsupported CFLAG: ${_FLAG}") endif() @@ -300,8 +300,8 @@ macro(ADD_CHECK_CXX_COMPILER_FLAG CHECK_CXX_COMPILER_FLAG(${_FLAG} SUPPORT_WALL) if(SUPPORT_WALL) - message(STATUS "Using CXXFLAG: ${_FLAG}") - set(_CFLAGS "${_CXXFLAGS} ${_FLAG}") + # message(STATUS "Using CXXFLAG: ${_FLAG}") + set(${_CXXFLAGS} "${${_CXXFLAGS}} ${_FLAG}") else() message(STATUS "Unsupported CXXFLAG: ${_FLAG}") endif() @@ -337,6 +337,6 @@ macro(get_blender_version) set(LASTITEM ${ITEM}) endforeach() - message(STATUS "Version major: ${BLENDER_VERSION_MAJOR}, Version minor: ${BLENDER_VERSION_MINOR}, Subversion: ${BLENDER_SUBVERSION}, Version: ${BLENDER_VERSION}") - message(STATUS "Minversion major: ${BLENDER_MINVERSION_MAJOR}, Minversion minor: ${BLENDER_MINVERSION_MINOR}, MinSubversion: ${BLENDER_MINSUBVERSION}, Minversion: ${BLENDER_MINVERSION}") + # message(STATUS "Version major: ${BLENDER_VERSION_MAJOR}, Version minor: ${BLENDER_VERSION_MINOR}, Subversion: ${BLENDER_SUBVERSION}, Version: ${BLENDER_VERSION}") + # message(STATUS "Minversion major: ${BLENDER_MINVERSION_MAJOR}, Minversion minor: ${BLENDER_MINVERSION_MINOR}, MinSubversion: ${BLENDER_MINSUBVERSION}, Minversion: ${BLENDER_MINVERSION}") endmacro() diff --git a/source/blender/makesdna/intern/CMakeLists.txt b/source/blender/makesdna/intern/CMakeLists.txt index 8329c28d42e..b6b2d2d2a13 100644 --- a/source/blender/makesdna/intern/CMakeLists.txt +++ b/source/blender/makesdna/intern/CMakeLists.txt @@ -24,6 +24,8 @@ # # ***** END GPL LICENSE BLOCK ***** +# message(STATUS "Configuring makesdna") + include_directories(../../../../intern/guardedalloc ..) # Build makesdna executable @@ -115,5 +117,3 @@ set(SRC ) blenderlib(bf_dna "${SRC}" "${INC}") - -message(STATUS "Configuring makesdna") diff --git a/source/blender/makesrna/intern/CMakeLists.txt b/source/blender/makesrna/intern/CMakeLists.txt index 3d189edb2f2..4794e98285e 100644 --- a/source/blender/makesrna/intern/CMakeLists.txt +++ b/source/blender/makesrna/intern/CMakeLists.txt @@ -27,7 +27,7 @@ # Generated code has some unused vars we can ignore. remove_strict_flags() -message(STATUS "Configuring makesrna") +# message(STATUS "Configuring makesrna") file(GLOB DEFSRC RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.c") file(GLOB APISRC RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*_api.c") diff --git a/source/blenderplayer/CMakeLists.txt b/source/blenderplayer/CMakeLists.txt index 46a1d41d098..53397070be8 100644 --- a/source/blenderplayer/CMakeLists.txt +++ b/source/blenderplayer/CMakeLists.txt @@ -24,7 +24,7 @@ # # ***** END GPL LICENSE BLOCK ***** -message(STATUS "Configuring blenderplayer") +# message(STATUS "Configuring blenderplayer") setup_libdirs() @@ -139,11 +139,13 @@ if(UNIX) endif() endforeach() if(REMLIB) - message(STATUS "Removing library ${REMLIB} from blenderplayer linking because: not configured") + # message(STATUS "Removing library ${REMLIB} from blenderplayer linking because: not configured") + list(APPEND REM_MSG ${REMLIB}) list(REMOVE_ITEM BLENDER_SORTED_LIBS ${REMLIB}) endif() endforeach() - + list(SORT REM_MSG) + message(STATUS "Player Skipping: (${REM_MSG})") target_link_libraries(blenderplayer ${BLENDER_SORTED_LIBS}) else() target_link_libraries(blenderplayer ${BLENDER_LINK_LIBS}) diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 9561cd4831c..c3a0b003917 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -121,7 +121,7 @@ if(WITH_BUILDINFO) ) endif() -message(STATUS "Configuring blender") +# message(STATUS "Configuring blender") add_executable(blender ${EXETYPE} ${SRC}) @@ -595,10 +595,13 @@ endif() endif() endforeach() if(REMLIB) - message(STATUS "Removing library ${REMLIB} from blender linking because: not configured") + # message(STATUS "Removing library ${REMLIB} from blender linking because: not configured") + list(APPEND REM_MSG ${REMLIB}) list(REMOVE_ITEM BLENDER_SORTED_LIBS ${REMLIB}) endif() endforeach() + list(SORT REM_MSG) + message(STATUS "Blender Skipping: (${REM_MSG})") target_link_libraries(blender ${BLENDER_SORTED_LIBS}) #else() # target_link_libraries(blender ${BLENDER_LINK_LIBS}) |