diff options
| author | mano-wii <germano.costa@ig.com.br> | 2019-06-15 21:35:36 +0300 |
|---|---|---|
| committer | mano-wii <germano.costa@ig.com.br> | 2019-06-15 21:35:36 +0300 |
| commit | bfd18c471d29b811bc2a16854ab1a389179b8368 (patch) | |
| tree | 292fee6abb695b86b89eb1475dc0f09d49a06477 | |
| parent | e567468ee103a9f5bcf86e2aa49ba88b5a11ad79 (diff) | |
Cmake: rename `WINDOWS_USE_VISUAL_STUDIO_FOLDERS` option to `WINDOWS_USE_VISUAL_STUDIO_PROJECT_FOLDERS`.
Suggested by @LazyDodo
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | build_files/cmake/macros.cmake | 2 | ||||
| -rw-r--r-- | build_files/cmake/platform/platform_win32.cmake | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 20cdac84e06..177b88874e2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -558,8 +558,8 @@ if(WIN32) set(WINDOWS_CODESIGN_PFX_PASSWORD CACHE STRING "password for pfx file used for codesigning.") mark_as_advanced(WINDOWS_CODESIGN_PFX_PASSWORD) - option(WINDOWS_USE_VISUAL_STUDIO_FOLDERS "Organize the visual studio project according to source folders." ON) - mark_as_advanced(WINDOWS_USE_VISUAL_STUDIO_FOLDERS) + option(WINDOWS_USE_VISUAL_STUDIO_PROJECT_FOLDERS "Organize the visual studio projects according to source folder structure." ON) + mark_as_advanced(WINDOWS_USE_VISUAL_STUDIO_PROJECT_FOLDERS) option(WINDOWS_PYTHON_DEBUG "Include the files needed for debugging python scripts with visual studio 2017+." OFF) mark_as_advanced(WINDOWS_PYTHON_DEBUG) diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake index cdbaea183bd..71bf7811135 100644 --- a/build_files/cmake/macros.cmake +++ b/build_files/cmake/macros.cmake @@ -245,7 +245,7 @@ function(blender_add_lib__impl blender_source_group("${sources}") #if enabled, set the FOLDER property for visual studio projects - if(WINDOWS_USE_VISUAL_STUDIO_FOLDERS) + if(WINDOWS_USE_VISUAL_STUDIO_PROJECT_FOLDERS) get_filename_component(FolderDir ${CMAKE_CURRENT_SOURCE_DIR} DIRECTORY) string(REPLACE ${CMAKE_SOURCE_DIR} "" FolderDir ${FolderDir}) set_target_properties(${name} PROPERTIES FOLDER ${FolderDir}) diff --git a/build_files/cmake/platform/platform_win32.cmake b/build_files/cmake/platform/platform_win32.cmake index 6a83eb17709..f91f9d8fef0 100644 --- a/build_files/cmake/platform/platform_win32.cmake +++ b/build_files/cmake/platform/platform_win32.cmake @@ -37,7 +37,7 @@ if(CMAKE_C_COMPILER_ID MATCHES "Clang") endif() endif() -set_property(GLOBAL PROPERTY USE_FOLDERS ${WINDOWS_USE_VISUAL_STUDIO_FOLDERS}) +set_property(GLOBAL PROPERTY USE_FOLDERS ${WINDOWS_USE_VISUAL_STUDIO_PROJECT_FOLDERS}) if(NOT WITH_PYTHON_MODULE) set_property(DIRECTORY PROPERTY VS_STARTUP_PROJECT blender) |