From b849f290c5a9f1db2e6067855934a75697ec2db2 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 4 Nov 2021 14:50:24 +1100 Subject: Cleanup: capitalize ON/OFF with CMake --- CMakeLists.txt | 2 +- build_files/cmake/platform/platform_win32.cmake | 34 ++++++++++++------------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 62e7d9b2941..7a5ac1918bc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -642,7 +642,7 @@ if(WIN32) option(WITH_WINDOWS_PDB "Generate a pdb file for client side stacktraces" ON) mark_as_advanced(WITH_WINDOWS_PDB) - option(WITH_WINDOWS_STRIPPED_PDB "Use a stripped PDB file" On) + option(WITH_WINDOWS_STRIPPED_PDB "Use a stripped PDB file" ON) mark_as_advanced(WITH_WINDOWS_STRIPPED_PDB) endif() diff --git a/build_files/cmake/platform/platform_win32.cmake b/build_files/cmake/platform/platform_win32.cmake index cb4d196d43f..e83eba74fc0 100644 --- a/build_files/cmake/platform/platform_win32.cmake +++ b/build_files/cmake/platform/platform_win32.cmake @@ -27,7 +27,7 @@ if(NOT MSVC) endif() if(CMAKE_C_COMPILER_ID MATCHES "Clang") - set(MSVC_CLANG On) + set(MSVC_CLANG ON) set(VC_TOOLS_DIR $ENV{VCToolsRedistDir} CACHE STRING "Location of the msvc redistributables") set(MSVC_REDIST_DIR ${VC_TOOLS_DIR}) if(DEFINED MSVC_REDIST_DIR) @@ -53,7 +53,7 @@ if(CMAKE_C_COMPILER_ID MATCHES "Clang") endif() if(WITH_WINDOWS_STRIPPED_PDB) message(WARNING "stripped pdb not supported with clang, disabling..") - set(WITH_WINDOWS_STRIPPED_PDB Off) + set(WITH_WINDOWS_STRIPPED_PDB OFF) endif() endif() @@ -159,7 +159,7 @@ endif() if(WITH_COMPILER_ASAN AND MSVC AND NOT MSVC_CLANG) if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.28.29828) #set a flag so we don't have to do this comparison all the time - SET(MSVC_ASAN On) + SET(MSVC_ASAN ON) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /fsanitize=address") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /fsanitize=address") string(APPEND CMAKE_EXE_LINKER_FLAGS_DEBUG " /INCREMENTAL:NO") @@ -179,22 +179,22 @@ endif() if(WITH_WINDOWS_SCCACHE AND CMAKE_VS_MSBUILD_COMMAND) message(WARNING "Disabling sccache, sccache is not supported with msbuild") - set(WITH_WINDOWS_SCCACHE Off) + set(WITH_WINDOWS_SCCACHE OFF) endif() # Debug Symbol format # sccache # MSVC_ASAN # format # why -# On # On # Z7 # sccache will only play nice with Z7 -# On # Off # Z7 # sccache will only play nice with Z7 -# Off # On # Zi # Asan will not play nice with Edit and Continue -# Off # Off # ZI # Neither asan nor sscache is enabled Edit and Continue is available +# ON # ON # Z7 # sccache will only play nice with Z7 +# ON # OFF # Z7 # sccache will only play nice with Z7 +# OFF # ON # Zi # Asan will not play nice with Edit and Continue +# OFF # OFF # ZI # Neither asan nor sscache is enabled Edit and Continue is available # Release Symbol format # sccache # MSVC_ASAN # format # why -# On # On # Z7 # sccache will only play nice with Z7 -# On # Off # Z7 # sccache will only play nice with Z7 -# Off # On # Zi # Asan will not play nice with Edit and Continue -# Off # Off # Zi # Edit and Continue disables some optimizations +# ON # ON # Z7 # sccache will only play nice with Z7 +# ON # OFF # Z7 # sccache will only play nice with Z7 +# OFF # ON # Zi # Asan will not play nice with Edit and Continue +# OFF # OFF # Zi # Edit and Continue disables some optimizations if(WITH_WINDOWS_SCCACHE) @@ -288,7 +288,7 @@ if(CMAKE_GENERATOR MATCHES "^Visual Studio.+" AND # Only supported in the VS IDE "EnableMicrosoftCodeAnalysis=false" "EnableClangTidyCodeAnalysis=true" ) - set(VS_CLANG_TIDY On) + set(VS_CLANG_TIDY ON) endif() # Mark libdir as system headers with a lower warn level, to resolve some warnings @@ -469,7 +469,7 @@ if(WITH_PYTHON) set(PYTHON_INCLUDE_DIR ${LIBDIR}/python/${_PYTHON_VERSION_NO_DOTS}/include) set(PYTHON_NUMPY_INCLUDE_DIRS ${LIBDIR}/python/${_PYTHON_VERSION_NO_DOTS}/lib/site-packages/numpy/core/include) - set(NUMPY_FOUND On) + set(NUMPY_FOUND ON) unset(_PYTHON_VERSION_NO_DOTS) # uncached vars set(PYTHON_INCLUDE_DIRS "${PYTHON_INCLUDE_DIR}") @@ -853,18 +853,18 @@ if(WITH_GMP) set(GMP_INCLUDE_DIRS ${LIBDIR}/gmp/include) set(GMP_LIBRARIES ${LIBDIR}/gmp/lib/libgmp-10.lib optimized ${LIBDIR}/gmp/lib/libgmpxx.lib debug ${LIBDIR}/gmp/lib/libgmpxx_d.lib) set(GMP_ROOT_DIR ${LIBDIR}/gmp) - set(GMP_FOUND On) + set(GMP_FOUND ON) endif() if(WITH_POTRACE) set(POTRACE_INCLUDE_DIRS ${LIBDIR}/potrace/include) set(POTRACE_LIBRARIES ${LIBDIR}/potrace/lib/potrace.lib) - set(POTRACE_FOUND On) + set(POTRACE_FOUND ON) endif() if(WITH_HARU) if(EXISTS ${LIBDIR}/haru) - set(HARU_FOUND On) + set(HARU_FOUND ON) set(HARU_ROOT_DIR ${LIBDIR}/haru) set(HARU_INCLUDE_DIRS ${HARU_ROOT_DIR}/include) set(HARU_LIBRARIES ${HARU_ROOT_DIR}/lib/libhpdfs.lib) -- cgit v1.2.3