Revision: 33709
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33709
Author: campbellbarton
Date: 2010-12-16 13:48:30 +0100 (Thu, 16 Dec 2010)
Log Message:
-----------
last commit to fix warnings didnt set them at all, not it works as it should.
also made cmakes output a lot quieter, messages can be uncommented for
debugging or added back if other devs need this for some reason.
Modified Paths:
--------------
trunk/blender/CMakeLists.txt
trunk/blender/build_files/cmake/macros.cmake
trunk/blender/source/blender/makesdna/intern/CMakeLists.txt
trunk/blender/source/blender/makesrna/intern/CMakeLists.txt
trunk/blender/source/blenderplayer/CMakeLists.txt
trunk/blender/source/creator/CMakeLists.txt
Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt 2010-12-16 11:31:04 UTC (rev 33708)
+++ trunk/blender/CMakeLists.txt 2010-12-16 12:48:30 UTC (rev 33709)
@@ -1026,6 +1026,9 @@
add_definitions(-DWITH_ASSERT_ABORT)
endif()
+# message(STATUS "Using CFLAGS: ${CMAKE_C_FLAGS}")
+# message(STATUS "Using CXXFLAGS: ${CMAKE_CXX_FLAGS}")
+
#-----------------------------------------------------------------------------
# Libraries
Modified: trunk/blender/build_files/cmake/macros.cmake
===================================================================
--- trunk/blender/build_files/cmake/macros.cmake 2010-12-16 11:31:04 UTC
(rev 33708)
+++ trunk/blender/build_files/cmake/macros.cmake 2010-12-16 12:48:30 UTC
(rev 33709)
@@ -5,7 +5,7 @@
sources
includes)
- message(STATUS "Configuring library ${name}")
+ # message(STATUS "Configuring library ${name}")
include_directories(${includes})
add_library(${name} ${sources})
@@ -205,7 +205,7 @@
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 @@
#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 @@
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 @@
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 @@
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()
Modified: trunk/blender/source/blender/makesdna/intern/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/makesdna/intern/CMakeLists.txt 2010-12-16
11:31:04 UTC (rev 33708)
+++ trunk/blender/source/blender/makesdna/intern/CMakeLists.txt 2010-12-16
12:48:30 UTC (rev 33709)
@@ -24,6 +24,8 @@
#
# ***** END GPL LICENSE BLOCK *****
+# message(STATUS "Configuring makesdna")
+
include_directories(../../../../intern/guardedalloc ..)
# Build makesdna executable
@@ -115,5 +117,3 @@
)
blenderlib(bf_dna "${SRC}" "${INC}")
-
-message(STATUS "Configuring makesdna")
Modified: trunk/blender/source/blender/makesrna/intern/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/makesrna/intern/CMakeLists.txt 2010-12-16
11:31:04 UTC (rev 33708)
+++ trunk/blender/source/blender/makesrna/intern/CMakeLists.txt 2010-12-16
12:48:30 UTC (rev 33709)
@@ -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")
Modified: trunk/blender/source/blenderplayer/CMakeLists.txt
===================================================================
--- trunk/blender/source/blenderplayer/CMakeLists.txt 2010-12-16 11:31:04 UTC
(rev 33708)
+++ trunk/blender/source/blenderplayer/CMakeLists.txt 2010-12-16 12:48:30 UTC
(rev 33709)
@@ -24,7 +24,7 @@
#
# ***** END GPL LICENSE BLOCK *****
-message(STATUS "Configuring blenderplayer")
+# message(STATUS "Configuring blenderplayer")
setup_libdirs()
@@ -139,11 +139,13 @@
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})
Modified: trunk/blender/source/creator/CMakeLists.txt
===================================================================
--- trunk/blender/source/creator/CMakeLists.txt 2010-12-16 11:31:04 UTC (rev
33708)
+++ trunk/blender/source/creator/CMakeLists.txt 2010-12-16 12:48:30 UTC (rev
33709)
@@ -121,7 +121,7 @@
)
endif()
-message(STATUS "Configuring blender")
+# message(STATUS "Configuring blender")
add_executable(blender ${EXETYPE} ${SRC})
@@ -595,10 +595,13 @@
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})
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
