diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-10-22 00:13:12 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-10-22 00:13:12 +0400 |
| commit | 10af15b85b743a18215a1fc58799264b5c798403 (patch) | |
| tree | 5c93a43229f31a9befdd2582d3fe382390add2cf /CMakeLists.txt | |
| parent | 3c9d69744e0aca3ffe3ace103233679988769e91 (diff) | |
| parent | aba149189b7f0ee08765d2ef63a94080d02bdbf4 (diff) | |
Cycles: svn merge -r40934:41157 ^/trunk/blender
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index c57f42f416c..be8109a18f0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -223,6 +223,10 @@ mark_as_advanced(WITH_CXX_GUARDEDALLOC) option(WITH_ASSERT_ABORT "Call abort() when raising an assertion through BLI_assert()" OFF) mark_as_advanced(WITH_ASSERT_ABORT) +option(WITH_PYTHON_UI_INFO "Allow navigating to UI source from the context menu" OFF) +mark_as_advanced(WITH_PYTHON_UI_INFO) + + if(APPLE) if(NOT CMAKE_OSX_ARCHITECTURES) set(CMAKE_OSX_ARCHITECTURES x86_64 CACHE STRING @@ -862,7 +866,7 @@ elseif(WIN32) set(PLATFORM_LINKFLAGS_DEBUG "/NODEFAULTLIB:libcmt.lib /NODEFAULTLIB:libc.lib") else() - # keep GCC spesific stuff here + # keep GCC specific stuff here if(CMAKE_COMPILER_IS_GNUCC) set(PLATFORM_LINKLIBS "-lshell32 -lshfolder -lgdi32 -lmsvcrt -lwinmm -lmingw32 -lm -lws2_32 -lz -lstdc++ -lole32 -luuid -lwsock32") set(PLATFORM_CFLAGS "-pipe -funsigned-char -fno-strict-aliasing") @@ -1452,6 +1456,10 @@ if(WITH_ASSERT_ABORT) add_definitions(-DWITH_ASSERT_ABORT) endif() +if(WITH_PYTHON_UI_INFO) + add_definitions(-DWITH_PYTHON_UI_INFO) +endif() + # message(STATUS "Using CFLAGS: ${CMAKE_C_FLAGS}") # message(STATUS "Using CXXFLAGS: ${CMAKE_CXX_FLAGS}") |