Răsfoiți Sursa

build system: minor changes to make it work again with the CI

Michele Caini 5 ani în urmă
părinte
comite
0b73082aa0
5 a modificat fișierele cu 11 adăugiri și 6 ștergeri
  1. 3 3
      .github/workflows/build.yml
  2. 1 1
      .github/workflows/coverage.yml
  3. 2 0
      CMakeLists.txt
  4. 2 2
      README.md
  5. 3 0
      TODO

+ 3 - 3
.github/workflows/build.yml

@@ -20,7 +20,7 @@ jobs:
       env:
         CXX: ${{ matrix.compiler }}
       run: |
-        cmake -DENTT_BUILD_LIB=ON -DENTT_BUILD_EXAMPLE=ON ..
+        cmake -DENTT_BUILD_TESTING=ON -DENTT_BUILD_LIB=ON -DENTT_BUILD_EXAMPLE=ON ..
         make -j4
     - name: Run tests
       working-directory: build
@@ -53,7 +53,7 @@ jobs:
     - name: Compile tests
       working-directory: build
       run: |
-        cmake -DENTT_BUILD_LIB=ON -DENTT_BUILD_EXAMPLE=ON ${{ matrix.toolset_option }} ..
+        cmake -DENTT_BUILD_TESTING=ON -DENTT_BUILD_LIB=ON -DENTT_BUILD_EXAMPLE=ON ${{ matrix.toolset_option }} ..
         cmake --build . -j 4
     - name: Run tests
       working-directory: build
@@ -70,7 +70,7 @@ jobs:
     - name: Compile tests
       working-directory: build
       run: |
-        cmake -DENTT_BUILD_LIB=ON -DENTT_BUILD_EXAMPLE=ON ..
+        cmake -DENTT_BUILD_TESTING=ON -DENTT_BUILD_LIB=ON -DENTT_BUILD_EXAMPLE=ON ..
         make -j4
     - name: Run tests
       working-directory: build

+ 1 - 1
.github/workflows/coverage.yml

@@ -16,7 +16,7 @@ jobs:
         CXXFLAGS: "-O0 --coverage -fno-inline -fno-inline-small-functions -fno-default-inline"
         CXX: g++
       run: |
-        cmake -DENTT_BUILD_LIB=ON -DENTT_BUILD_EXAMPLE=ON ..
+        cmake -DENTT_BUILD_TESTING=ON -DENTT_BUILD_LIB=ON -DENTT_BUILD_EXAMPLE=ON ..
         make -j4
     - name: Run tests
       working-directory: build

+ 2 - 0
CMakeLists.txt

@@ -150,6 +150,8 @@ export(PACKAGE EnTT)
 
 include(CTest)
 
+option(ENTT_BUILD_TESTING "Enable building tests." OFF)
+
 if(ENTT_BUILD_TESTING)
     option(ENTT_FIND_GTEST_PACKAGE "Enable finding gtest package." OFF)
     option(ENTT_BUILD_BENCHMARK "Build benchmark." OFF)

+ 2 - 2
README.md

@@ -191,8 +191,8 @@ reasons.
 
 If you are interested, you can compile the `benchmark` test in release mode (to
 enable compiler optimizations, otherwise it would make little sense) by setting
-the `ENTT_BUILD_BENCHMARK` option of `CMake` to `ON`, then evaluate yourself whether
-you're satisfied with the results or not.
+the `ENTT_BUILD_BENCHMARK` option of `CMake` to `ON`, then evaluate yourself
+whether you're satisfied with the results or not.
 
 Honestly I got tired of updating the README file whenever there is an
 improvement.<br/>

+ 3 - 0
TODO

@@ -17,6 +17,9 @@
   - ...
 
 WIP:
+* HP: inject the registry to pools rather than passing it every time (fake vtable prep)
+* HP: fake vtable, see dino:: for a reasonable and customizable (pay-per-use) approach
+* HP: meta any/meta container: reduce instantiations with a single function fake vtable
 * suppress warnings in meta.hpp (uninitialized members)
 * make view pack work also with groups, add multi-type iterator (not only input iterators)
 * add exclude-only views to combine with packs