diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-06-10 09:21:38 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-10 09:21:50 +0300 |
| commit | a52152c59fa28993dd9e82866cf69a76cc63d9d9 (patch) | |
| tree | fa91891bc6b2b87432511d7bc243508781f6af62 /CMakeLists.txt | |
| parent | dd67d703a749649fb13e4a5b5c993a1f2785d06b (diff) | |
| parent | ae01df5779de8ba76f46e51449891e567701d2d8 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 69d0abe1e25..5f1b9b1643c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -196,7 +196,7 @@ mark_as_advanced(WITH_BLENDER) option(WITH_INTERNATIONAL "Enable I18N (International fonts and text)" ON) option(WITH_PYTHON "Enable Embedded Python API (only disable for development)" ON) -option(WITH_PYTHON_SECURITY "Disables execution of scripts within blend files by default" ON) +option(WITH_PYTHON_SECURITY "Disables execution of scripts within blend files by default" ON) mark_as_advanced(WITH_PYTHON) # dont want people disabling this unless they really know what they are doing. mark_as_advanced(WITH_PYTHON_SECURITY) # some distributions see this as a security issue, rather than have them patch it, make a build option. @@ -545,10 +545,11 @@ if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang") find_library(COMPILER_ASAN_LIBRARY asan ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}) else() find_library( COMPILER_ASAN_LIBRARY NAMES clang_rt.asan-x86_64 - PATHS [HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\LLVM\\LLVM;]/lib/clang/7.0.0/lib/windows - [HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\LLVM\\LLVM;]/lib/clang/6.0.0/lib/windows - ) - endif() + PATHS + [HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\LLVM\\LLVM;]/lib/clang/7.0.0/lib/windows + [HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\LLVM\\LLVM;]/lib/clang/6.0.0/lib/windows + ) + endif() mark_as_advanced(COMPILER_ASAN_LIBRARY) endif() endif() @@ -1206,7 +1207,7 @@ else() list(APPEND GL_DEFINITIONS -DGLEW_STATIC) - # This won't affect the non-experimental glew library, + # This won't affect the non-experimental glew library, # but is used for conditional compilation elsewhere. list(APPEND GL_DEFINITIONS -DGLEW_NO_ES) @@ -1496,7 +1497,7 @@ elseif(CMAKE_C_COMPILER_ID MATCHES "MSVC") "/wd4267" # conversion from 'size_t' to 'type', possible loss of data "/wd4305" # truncation from 'type1' to 'type2' "/wd4800" # forcing value to bool 'true' or 'false' - "/wd4828" # The file contains a character that is illegal + "/wd4828" # The file contains a character that is illegal # errors: "/we4013" # 'function' undefined; assuming extern returning int "/we4133" # incompatible pointer types |