kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

last commit to fix warnings didnt set them at all, not it works as it should.

Browse Source 
also made cmakes output a lot quieter, messages can be uncommented for debugging or added back if other devs need this for some reason.
This commit is contained in:
Campbell Barton 2010-12-16 12:48:30 +00:00
parent d3070ad9ac
commit 566bda734a
6 changed files with 29 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -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

26
build_files/cmake/macros.cmake
View File

@ -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()

4
source/blender/makesdna/intern/CMakeLists.txt
View File

@ -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")

2
source/blender/makesrna/intern/CMakeLists.txt
View File

@ -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")

8
source/blenderplayer/CMakeLists.txt
View File

@ -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})

7
source/creator/CMakeLists.txt
View File

@ -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})