diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2009-08-22 09:46:03 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2009-08-22 09:46:03 +0400 |
| commit | b20f4e46c686f9c9fb0043eb3b95f639773d4a41 (patch) | |
| tree | 6d37a4cfba3f43141d566121114d2698c5c4b59c /CMakeLists.txt | |
| parent | d4407115faaf89061eed36cb69664f071db3fa31 (diff) | |
remove -Wnested-externs warning for CMake/unix, since this is used a lot, if we want to remove it can be re-enabled.
fix view3d python errors with no object/edit object.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 749284def28..8ef4296e266 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -72,6 +72,7 @@ OPTION(WITH_FFTW3 "Enable FFTW3 support" OFF) OPTION(WITH_JACK "Enable Jack Support (http://www.jackaudio.org)" OFF) OPTION(WITH_SNDFILE "Enable libsndfile Support (http://www.mega-nerd.com/libsndfile)" OFF) OPTION(WITH_CXX_GUARDEDALLOC "Enable GuardedAlloc for C++ memory allocation" OFF) +# OPTION(WITH_BUILDINFO "Include extra build details" ON) OPTION(WITH_INSTALL "Install accompanying scripts and language files needed to run blender" ON) IF(NOT WITH_GAMEENGINE AND WITH_PLAYER) @@ -212,7 +213,7 @@ IF(UNIX AND NOT APPLE) SET(PLATFORM_LINKFLAGS "-pthread") # Better warnings - SET(C_WARNINGS "-Wall -Wno-char-subscripts -Wpointer-arith -Wcast-align -Wnested-externs -Wdeclaration-after-statement") + SET(C_WARNINGS "-Wall -Wno-char-subscripts -Wpointer-arith -Wcast-align -Wdeclaration-after-statement") SET(CXX_WARNINGS "-Wall -Wno-invalid-offsetof -Wno-sign-compare") INCLUDE_DIRECTORIES(${JPEG_INCLUDE_DIR} ${PNG_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ) @@ -511,6 +512,17 @@ IF(CMAKE_SYSTEM_NAME MATCHES "Linux") SET(BINRELOC_INC ${BINRELOC}/include) ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux") + +# TODO - buildinfo +# IF(UNIX) +# IF(WITH_BUILDINFO) +# EXEC_PROGRAM("date \"+%Y-%m-%d\"" OUTPUT_VARIABLE BUILD_DATE) +# EXEC_PROGRAM("date \"+%H:%M:%S\"" OUTPUT_VARIABLE BUILD_TIME) +# EXEC_PROGRAM("svnversion ${CMAKE_SOURCE_DIR}" OUTPUT_VARIABLE BUILD_REV) +# SET(BUILD_TYPE ${CMAKE_BUILD_TYPE}) +# ENDIF(WITH_BUILDINFO) +# ENDIF(UNIX) + #----------------------------------------------------------------------------- # Common. |