Fix builds without test or examples (#87)

Author: takev

.github/appveyor.yml

@@ -306,7 +306,7 @@ artifacts:
 #-------------------------------------------------------------------
 
 cache:
-  - C:\Tools\vcpkg\installed -> appveyor.yml
+  - '%APPVEYOR_BUILD_FOLDER%\build\vcpkg_installed -> %APPVEYOR_BUILD_FOLDER%\build\vcpkg_installed\vcpkg\status'
   - '%VULKAN_SDK%\Bin -> appveyor.yml'
   - '%VULKAN_SDK%\Bin32 -> appveyor.yml'
   - '%VULKAN_SDK%\Include -> appveyor.yml'

CMakeLists.txt

@@ -463,22 +463,17 @@ endif()
 #-------------------------------------------------------------------
 # Installation Rules: ttauri_tests                      (executable)
 #-------------------------------------------------------------------
-
-install(TARGETS ttauri_tests DESTINATION tests)
-
-install(DIRECTORY tests/data/ DESTINATION tests)
-
-# experimental
-x_vcpkg_install_local_dependencies(TARGETS ttauri_tests DESTINATION tests)
+if(TT_BUILD_TESTS)
+    install(TARGETS ttauri_tests DESTINATION tests)
+    install(DIRECTORY tests/data/ DESTINATION tests)
+    x_vcpkg_install_local_dependencies(TARGETS ttauri_tests DESTINATION tests)
+endif()
 
 #-------------------------------------------------------------------
 # Build examples
 #-------------------------------------------------------------------
-
 if(TT_BUILD_EXAMPLES)
-
     add_subdirectory(examples/ttauri_demo)
-
 endif()
 
 #-------------------------------------------------------------------

src/ttauri/CMakeLists.txt

@@ -188,38 +188,40 @@ if(TT_BUILD_PCH)
     endif()
 endif()
 
-target_sources(ttauri_tests PRIVATE
-    algorithm_tests.cpp
-    bezier_curve_tests.cpp
-    bigint_tests.cpp
-    coroutine_tests.cpp
-    counters_tests.cpp
-    datum_tests.cpp
-    decimal_tests.cpp
-    exceptions_tests.cpp
-    file_view_tests.cpp
-    forward_value_tests.cpp
-    #gap_buffer_tests.cpp
-    glob_tests.cpp
-    int_overflow_tests.cpp
-    interval_extent2_tests.cpp
-    math_tests.cpp
-    graphic_path_tests.cpp
-    pixel_map_tests.cpp
-    polymorphic_optional_tests.cpp
-    polynomial_tests.cpp
-    ranges_tests.cpp
-    safe_int_tests.cpp
-    small_map_tests.cpp
-    strings_tests.cpp
-    tokenizer_tests.cpp
-    type_traits_tests.cpp
-    url_parser_tests.cpp
-    URL_tests.cpp
-)
+if(TT_BUILD_TESTS)
+    target_sources(ttauri_tests PRIVATE
+        algorithm_tests.cpp
+        bezier_curve_tests.cpp
+        bigint_tests.cpp
+        coroutine_tests.cpp
+        counters_tests.cpp
+        datum_tests.cpp
+        decimal_tests.cpp
+        exceptions_tests.cpp
+        file_view_tests.cpp
+        forward_value_tests.cpp
+        #gap_buffer_tests.cpp
+        glob_tests.cpp
+        int_overflow_tests.cpp
+        interval_extent2_tests.cpp
+        math_tests.cpp
+        graphic_path_tests.cpp
+        pixel_map_tests.cpp
+        polymorphic_optional_tests.cpp
+        polynomial_tests.cpp
+        ranges_tests.cpp
+        safe_int_tests.cpp
+        small_map_tests.cpp
+        strings_tests.cpp
+        tokenizer_tests.cpp
+        type_traits_tests.cpp
+        url_parser_tests.cpp
+        URL_tests.cpp
+    )
+endif()
 
-if(TT_BUILD_PCH)
-    if(NOT TT_ENABLE_ANALYSIS)
+
+if(TT_BUILD_TESTS AND TT_BUILD_PCH AND NOT TT_ENABLE_ANALYSIS)
     target_precompile_headers(ttauri_tests PRIVATE
         assert.hpp
         counters.hpp
@@ -233,5 +235,4 @@ if(TT_BUILD_PCH)
         trace.hpp
         URL.hpp
     )
-    endif()
 endif()

src/ttauri/codec/CMakeLists.txt

@@ -19,9 +19,11 @@ target_sources(ttauri PRIVATE
     BON8.cpp
 )
 
-target_sources(ttauri_tests PRIVATE
-    JSON_tests.cpp
-    gzip_tests.cpp
-    base_n_tests.cpp
-    SHA2_tests.cpp
-)
+if(TT_BUILD_TESTS)
+    target_sources(ttauri_tests PRIVATE
+        JSON_tests.cpp
+        gzip_tests.cpp
+        base_n_tests.cpp
+        SHA2_tests.cpp
+    )
+endif()

src/ttauri/color/CMakeLists.txt

@@ -14,6 +14,8 @@ target_sources(ttauri PRIVATE
     sdf_r8.hpp
 )
 
-target_sources(ttauri_tests PRIVATE
-    color_space_tests.cpp
-)
+if(TT_BUILD_TESTS)
+    target_sources(ttauri_tests PRIVATE
+        color_space_tests.cpp
+    )
+endif()

src/ttauri/formula/CMakeLists.txt

@@ -60,6 +60,8 @@ target_sources(ttauri PRIVATE
     formula_vector_literal_node.hpp
 )
 
-target_sources(ttauri_tests PRIVATE
-    formula_tests.cpp
-)
+if(TT_BUILD_TESTS)
+    target_sources(ttauri_tests PRIVATE
+        formula_tests.cpp
+    )
+endif()

src/ttauri/geometry/CMakeLists.txt

@@ -17,15 +17,16 @@ target_sources(ttauri PRIVATE
     vector.hpp
 )
 
-target_sources(ttauri_tests PRIVATE
-    identity_tests.cpp
-    matrix_tests.cpp
-    numeric_array_tests.cpp
-    point_tests.cpp
-    scale_tests.cpp
-    spread_sheet_address_tests.cpp
-    transform_tests.cpp
-    translate_tests.cpp
-    vector_tests.cpp
-)
-
+if(TT_BUILD_TESTS)
+    target_sources(ttauri_tests PRIVATE
+        identity_tests.cpp
+        matrix_tests.cpp
+        numeric_array_tests.cpp
+        point_tests.cpp
+        scale_tests.cpp
+        spread_sheet_address_tests.cpp
+        transform_tests.cpp
+        translate_tests.cpp
+        vector_tests.cpp
+    )
+endif()

src/ttauri/skeleton/CMakeLists.txt

@@ -23,6 +23,8 @@ target_sources(ttauri PRIVATE
     skeleton_while_node.hpp
 )
 
-target_sources(ttauri_tests PRIVATE
-    skeleton_tests.cpp
-)
+if(TT_BUILD_TESTS)
+    target_sources(ttauri_tests PRIVATE
+        skeleton_tests.cpp
+    )
+endif()

src/ttauri/text/CMakeLists.txt

@@ -65,10 +65,11 @@ target_sources(ttauri PRIVATE
     unicode_ranges.hpp
 )
 
-
-target_sources(ttauri_tests PRIVATE
-    unicode_bidi_tests.cpp
-    unicode_text_segmentation_tests.cpp
-    unicode_normalization_tests.cpp
-    language_tag_tests.cpp
-)
+if(TT_BUILD_TESTS)
+    target_sources(ttauri_tests PRIVATE
+        unicode_bidi_tests.cpp
+        unicode_text_segmentation_tests.cpp
+        unicode_normalization_tests.cpp
+        language_tag_tests.cpp
+    )
+endif()

vcpkg.json

@@ -1,13 +1,14 @@
 {
-    "name": "ttauri",
-    "version": "0.3.0",
-    "license": "BSL-1.0",
-    "homepage": "https://github.com/ttauri-project/ttauri",
-    "description": "A portable, low latency, retained-mode GUI library written in C++.",
-    "dependencies": [
-      "fmt",
-      "date",
-      "vulkan",
-      "vulkan-memory-allocator"
-    ]
+  "name": "ttauri",
+  "version": "0.3.0",
+  "description": "A portable, low latency, retained-mode GUI library written in C++.",
+  "homepage": "https://github.com/ttauri-project/ttauri",
+  "license": "BSL-1.0",
+  "supports": "windows & x64",
+  "dependencies": [
+    "date",
+    "fmt",
+    "vulkan",
+    "vulkan-memory-allocator"
+  ]
 }