diff --git a/CMakeLists.txt b/CMakeLists.txt index 57a056d7..7f9e692d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -87,10 +87,14 @@ set(UNITS_NAMESPACE CACHE STRING "Top-level namespace name. Default is `units`." ) -if (CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME AND NOT UNITS_BINARY_ONLY_INSTALL) - option(UNITS_INSTALL "Generate and install cmake package files and shared library if built" ON) +if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME AND NOT UNITS_BINARY_ONLY_INSTALL) + option(UNITS_INSTALL + "Generate and install cmake package files and shared library if built" ON + ) else() - option(UNITS_INSTALL "Generate and install cmake package files and shared library if built" OFF) + option(UNITS_INSTALL + "Generate and install cmake package files and shared library if built" OFF + ) endif() mark_as_advanced(UNITS_INSTALL) diff --git a/config/AddGoogletest.cmake b/config/AddGoogletest.cmake index e3820bbc..8a9b3af9 100644 --- a/config/AddGoogletest.cmake +++ b/config/AddGoogletest.cmake @@ -8,17 +8,32 @@ # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # -# Add make check, as well, which gives output on failed tests without having to set an environment -# variable. +# Add make check, as well, which gives output on failed tests without having to set an +# environment variable. # include(extraMacros) -set(CMAKE_WARN_DEPRECATED OFF CACHE INTERNAL "" FORCE) -set(gtest_force_shared_crt ON CACHE INTERNAL "") +set(CMAKE_WARN_DEPRECATED + OFF + CACHE INTERNAL "" FORCE +) +set(gtest_force_shared_crt + ON + CACHE INTERNAL "" +) -set(BUILD_SHARED_LIBS OFF CACHE INTERNAL "") -set(HAVE_STD_REGEX ON CACHE INTERNAL "") +set(BUILD_SHARED_LIBS + OFF + CACHE INTERNAL "" +) +set(HAVE_STD_REGEX + ON + CACHE INTERNAL "" +) -set(CMAKE_SUPPRESS_DEVELOPER_WARNINGS 1 CACHE INTERNAL "") +set(CMAKE_SUPPRESS_DEVELOPER_WARNINGS + 1 + CACHE INTERNAL "" +) add_subdirectory( ${CMAKE_SOURCE_DIR}/ThirdParty/googletest ${CMAKE_BINARY_DIR}/ThirdParty/googletest @@ -26,8 +41,8 @@ add_subdirectory( ) if(NOT MSVC) - # target_Compile_options(gtest PRIVATE "-Wno-undef") target_Compile_options(gmock PRIVATE - # "-Wno-undef") target_Compile_options(gtest_main PRIVATE "-Wno-undef") + # target_Compile_options(gtest PRIVATE "-Wno-undef") target_Compile_options(gmock + # PRIVATE "-Wno-undef") target_Compile_options(gtest_main PRIVATE "-Wno-undef") # target_Compile_options(gmock_main PRIVATE "-Wno-undef") endif() diff --git a/config/spelling_ignorelines.txt b/config/spelling_ignorelines.txt index deae5ecf..ed9db7cd 100644 --- a/config/spelling_ignorelines.txt +++ b/config/spelling_ignorelines.txt @@ -1 +1 @@ -ThirdParty \ No newline at end of file +ThirdParty