diff options
author | Julian Eisel <eiseljulian@gmail.com> | 2017-03-06 15:00:46 +0300 |
---|---|---|
committer | Julian Eisel <eiseljulian@gmail.com> | 2017-03-06 15:00:46 +0300 |
commit | a5cba9aab9a2ade00caefc1a7697f8fbd3f7304f (patch) | |
tree | b34138ac968663a47cdd2b09a26ea68aeeba2377 /CMakeLists.txt | |
parent | dc9a7f861fa43fecae7450ee254a711b061c0c26 (diff) | |
parent | b498db06eb43f1e036f16cb346bf4cbb6d20e6d5 (diff) |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/editors/space_nla/nla_draw.c
source/blender/editors/space_view3d/view3d_draw.c
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r-- | CMakeLists.txt | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index e16f0cddfd7..ee9b420dc36 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -520,18 +520,20 @@ endif() option(WITH_LEGACY_DEPSGRAPH "Build Blender with legacy dependency graph" ON) mark_as_advanced(WITH_LEGACY_DEPSGRAPH) -# Use hardcoded paths or find_package to find externals -option(WITH_WINDOWS_FIND_MODULES "Use find_package to locate libraries" OFF) -mark_as_advanced(WITH_WINDOWS_FIND_MODULES) +if(WIN32) + # Use hardcoded paths or find_package to find externals + option(WITH_WINDOWS_FIND_MODULES "Use find_package to locate libraries" OFF) + mark_as_advanced(WITH_WINDOWS_FIND_MODULES) -option(WITH_WINDOWS_CODESIGN "Use signtool to sign the final binary." OFF) -mark_as_advanced(WITH_WINDOWS_CODESIGN) + option(WITH_WINDOWS_CODESIGN "Use signtool to sign the final binary." OFF) + mark_as_advanced(WITH_WINDOWS_CODESIGN) -set(WINDOWS_CODESIGN_PFX CACHE FILEPATH "Path to pfx file to use for codesigning.") -mark_as_advanced(WINDOWS_CODESIGN_PFX) + set(WINDOWS_CODESIGN_PFX CACHE FILEPATH "Path to pfx file to use for codesigning.") + mark_as_advanced(WINDOWS_CODESIGN_PFX) -set(WINDOWS_CODESIGN_PFX_PASSWORD CACHE STRING "password for pfx file used for codesigning.") -mark_as_advanced(WINDOWS_CODESIGN_PFX_PASSWORD) + set(WINDOWS_CODESIGN_PFX_PASSWORD CACHE STRING "password for pfx file used for codesigning.") + mark_as_advanced(WINDOWS_CODESIGN_PFX_PASSWORD) +endif() # avoid using again option_defaults_clear() |