Rebase with my develop

Author: ClausKlein

CMakeLists.txt

@@ -38,7 +38,7 @@ myproject_local_options()
 set(CMAKE_CXX_VISIBILITY_PRESET hidden)
 
 set(GIT_SHA
-    "Unknown"
+    "0508115-dirty"
     CACHE STRING "SHA this build was generated from")
 string(
   SUBSTRING "${GIT_SHA}"
@@ -92,7 +92,10 @@ if(MSVC)
 endif()
 
 # set the startup project for the "play" button in MSVC
-set_property(DIRECTORY PROPERTY VS_STARTUP_PROJECT intro)
+if(TARGET intro)
+  set_property(DIRECTORY PROPERTY VS_STARTUP_PROJECT intro)
+  set(VS_STARTUP_PROJECT intro)
+endif()
 
 if(ENABLE_DOXYGEN)
   include(cmake/Doxygen.cmake)
@@ -109,7 +112,7 @@ include(cmake/PackageProject.cmake)
 # we know we want to ship
 myproject_package_project(
   TARGETS
-  intro
+  ${VS_STARTUP_PROJECT}
   myproject_options
   myproject_warnings
   # FIXME: this does not work! CK

CMakePresets.json

@@ -211,7 +211,7 @@
             }
         }
     ],
-    "buildPresets":[
+    "buildPresets": [
         {
             "name": "build-common",
             "description": "Build CMake settings that apply to all configurations",
@@ -239,24 +239,34 @@
             "configurePreset": "windows-clang-release"
         },
         {
-            "name": "build-unixlike-gcc-debug",
-            "inherits": "build-common",
-            "configurePreset": "unixlike-gcc-debug"
+            "name": "clang-release",
+            "configurePreset": "clang-release"
         },
         {
-            "name": "build-unixlike-gcc-release",
-            "inherits": "build-common",
-            "configurePreset": "unixlike-gcc-release"
+            "name": "clang-install",
+            "configurePreset": "clang-release",
+            "targets": [
+                "install"
+            ]
         },
         {
-            "name": "build-unixlike-clang-debug",
-            "inherits": "build-common",
-            "configurePreset": "unixlike-clang-debug"
+            "name": "clang-debug",
+            "configurePreset": "clang-debug"
         },
         {
-            "name": "build-unixlike-clang-release",
-            "inherits": "build-common",
-            "configurePreset": "unixlike-clang-release"
+            "name": "gcc-release",
+            "configurePreset": "gcc-release"
+        },
+        {
+            "name": "gcc-install",
+            "configurePreset": "gcc-release",
+            "targets": [
+                "install"
+            ]
+        },
+        {
+            "name": "gcc-debug",
+            "configurePreset": "gcc-debug"
         }
     ],
     "testPresets": [
@@ -330,38 +340,6 @@
             "configurePreset": "clang-release"
         }
     ],
-    "buildPresets": [
-        {
-            "name": "clang-release",
-            "configurePreset": "clang-release"
-        },
-        {
-            "name": "clang-install",
-            "configurePreset": "clang-release",
-            "targets": [
-                "install"
-            ]
-        },
-        {
-            "name": "clang-debug",
-            "configurePreset": "clang-debug"
-        },
-        {
-            "name": "gcc-release",
-            "configurePreset": "gcc-release"
-        },
-        {
-            "name": "gcc-install",
-            "configurePreset": "gcc-release",
-            "targets": [
-                "install"
-            ]
-        },
-        {
-            "name": "gcc-debug",
-            "configurePreset": "gcc-debug"
-        }
-    ],
     "packagePresets": [
         {
             "name": "clang-release",

CMakeUserPresets.json

@@ -12,20 +12,27 @@
             "generator": "Ninja",
             "cacheVariables": {
                 "CMAKE_HOST_SYSTEM_PROCESSOR": "$penv{PROCESSOR_ARCHITECTURE}"
+            },
+            "environment": {
+                "CPM_USE_LOCAL_PACKAGES": "1"
             }
         },
         {
             "name": "common-config",
             "description": "Settings for all toolchains",
             "hidden": true,
-            "inherits": "default-config",
+            "inherits": ["conf-unixlike-common", "default-config"],
             "binaryDir": "${sourceDir}/out/build/${presetName}",
             "installDir": "${sourceDir}/out/install/${presetName}",
             "cacheVariables": {
+                "myproject_BUILD_FTXUI": false,
                 "ENABLE_DOXYGEN": false,
                 "ENABLE_CPPCHECK": false,
                 "ENABLE_CLANG_TIDY": false
             },
+            "environment": {
+                "CPM_USE_LOCAL_PACKAGES": "0"
+            },
             "vendor": {
                 "microsoft.com/VisualStudioRemoteSettings/CMake/1.0": {
                     "sourceDir": "$env{HOME}/.vs/$ms{projectDirName}"
@@ -36,7 +43,7 @@
             "name": "debug",
             "displayName": "Debug",
             "description": "Debug build type",
-            "inherits": "conf-unixlike-common",
+            "inherits": "common-config",
             "cacheVariables": {
                 "CMAKE_SKIP_INSTALL_RULES": true,
                 "CMAKE_BUILD_TYPE": "Debug",
@@ -47,7 +54,7 @@
             "name": "release",
             "displayName": "Release",
             "description": "Release build type",
-            "inherits": "conf-unixlike-common",
+            "inherits": "common-config",
             "cacheVariables": {
                 "CMAKE_BUILD_TYPE": "Release",
                 "ENABLE_DOXYGEN": true

Dependencies.cmake

@@ -28,12 +28,14 @@ function(myproject_setup_dependencies)
     cpmaddpackage("gh:catchorg/[email protected]")
   endif()
 
-  if(NOT TARGET CLI11::CLI11)
-    cpmaddpackage("gh:CLIUtils/[email protected]")
-  endif()
-
-  if(NOT TARGET ftxui::screen)
-    cpmaddpackage("gh:ArthurSonzogni/[email protected]")
+  if(myproject_BUILD_FTXUI)
+    if(NOT TARGET CLI11::CLI11)
+      cpmaddpackage("gh:CLIUtils/[email protected]")
+    endif()
+
+    if(NOT TARGET ftxui::screen)
+      cpmaddpackage("gh:ArthurSonzogni/[email protected]")
+    endif()
   endif()
 
   if(NOT TARGET tools::tools)

ProjectOptions.cmake

@@ -122,6 +122,7 @@ macro(myproject_setup_options)
   endif()
 
   option(myproject_BUILD_FUZZ_TESTS "Enable fuzz testing executable" ${DEFAULT_FUZZER})
+  option(myproject_BUILD_FTXUI "Build FTXUI sample too" ON)
 
 endmacro()
 
@@ -135,7 +136,7 @@ macro(myproject_global_options)
 
   if(myproject_ENABLE_HARDENING AND myproject_ENABLE_GLOBAL_HARDENING)
     include(cmake/Hardening.cmake)
-    if(NOT SUPPORTS_UBSAN 
+    if(NOT SUPPORTS_UBSAN
        OR myproject_ENABLE_SANITIZER_UNDEFINED
        OR myproject_ENABLE_SANITIZER_ADDRESS
        OR myproject_ENABLE_SANITIZER_THREAD
@@ -221,7 +222,7 @@ macro(myproject_local_options)
 
   if(myproject_ENABLE_HARDENING AND NOT myproject_ENABLE_GLOBAL_HARDENING)
     include(cmake/Hardening.cmake)
-    if(NOT SUPPORTS_UBSAN 
+    if(NOT SUPPORTS_UBSAN
        OR myproject_ENABLE_SANITIZER_UNDEFINED
        OR myproject_ENABLE_SANITIZER_ADDRESS
        OR myproject_ENABLE_SANITIZER_THREAD

src/CMakeLists.txt

@@ -1,2 +1,5 @@
 add_subdirectory(sample_library)
-add_subdirectory(ftxui_sample)
+
+if(myproject_BUILD_FTXUI)
+  add_subdirectory(ftxui_sample)
+endif()

test/CMakeLists.txt

@@ -24,14 +24,16 @@ else()
 endif()
 
 # Provide a simple smoke test to make sure that the CLI works and can display a --help message
-add_test(NAME cli.has_help COMMAND intro --help)
-
-# Provide a test to verify that the version being reported from the application
-# matches the version given to CMake. This will be important once you package
-# your program. Real world shows that this is the kind of simple mistake that is easy
-# to make, but also easy to test for.
-add_test(NAME cli.version_matches COMMAND intro --version)
-set_tests_properties(cli.version_matches PROPERTIES PASS_REGULAR_EXPRESSION "${PROJECT_VERSION}")
+if(TARGET intro)
+  add_test(NAME cli.has_help COMMAND intro --help)
+
+  # Provide a test to verify that the version being reported from the application
+  # matches the version given to CMake. This will be important once you package
+  # your program. Real world shows that this is the kind of simple mistake that is easy
+  # to make, but also easy to test for.
+  add_test(NAME cli.version_matches COMMAND intro --version)
+  set_tests_properties(cli.version_matches PROPERTIES PASS_REGULAR_EXPRESSION "${PROJECT_VERSION}")
+endif()
 
 add_executable(tests tests.cpp)
 target_link_libraries(