Skip to content

Commit 9d19943

Browse files
committed
updates researched from airstrike3d tools
1 parent 0c3a850 commit 9d19943

19 files changed

+67
-35
lines changed

CMakeLists.txt

Lines changed: 12 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -11,35 +11,26 @@ list(
1111
APPEND
1212
CMAKE_PREFIX_PATH
1313
${CMAKE_CURRENT_LIST_DIR}/cmake
14-
${CMAKE_CURRENT_LIST_DIR}/cmake/pkg
15-
${CMAKE_CURRENT_LIST_DIR}/cmake/utils)
14+
${CMAKE_CURRENT_LIST_DIR}/cmake/description
15+
${CMAKE_CURRENT_LIST_DIR}/cmake/code-quality)
1616

1717
if(CMAKE_CROSSCOMPILING)
1818
list(
1919
APPEND
2020
CMAKE_FIND_ROOT_PATH
21-
"${CMAKE_CURRENT_LIST_DIR}/cmake"
22-
"${CMAKE_CURRENT_LIST_DIR}/cmake/pkg"
23-
"${CMAKE_CURRENT_LIST_DIR}/cmake/utils")
21+
${CMAKE_CURRENT_LIST_DIR}/cmake
22+
${CMAKE_CURRENT_LIST_DIR}/cmake/description
23+
${CMAKE_CURRENT_LIST_DIR}/cmake/code-quality)
2424
endif()
2525

2626
find_package(warnings CONFIG REQUIRED)
27-
find_package(package CONFIG REQUIRED)
27+
find_package(package_description CONFIG REQUIRED)
2828

29-
# Tooling (optional but guarded)
30-
option(ENABLE_DEV_TOOLS "Enable dev tools like clang-format, clang-tidy, etc."
31-
OFF)
32-
33-
if(ENABLE_DEV_TOOLS)
34-
find_package(clang_format CONFIG REQUIRED)
35-
find_package(clang_tidy CONFIG REQUIRED)
36-
find_package(clang_doc CONFIG REQUIRED)
37-
find_package(cpplint CONFIG REQUIRED)
38-
find_package(doxygen CONFIG REQUIRED)
39-
40-
# Optional: fail if critical tools missing in dev mode?
41-
# mark_as_advanced(...) # hide from GUI if desired
42-
endif()
29+
find_package(clang_format CONFIG REQUIRED)
30+
find_package(clang_tidy CONFIG REQUIRED)
31+
find_package(clang_doc CONFIG REQUIRED)
32+
find_package(cpplint CONFIG REQUIRED)
33+
find_package(doxygen CONFIG REQUIRED)
4334

4435
find_package(cpm CONFIG REQUIRED)
4536

@@ -48,4 +39,4 @@ add_subdirectory(src)
4839
include(CTest)
4940
if(BUILD_TESTING)
5041
add_subdirectory(tests)
51-
endif()
42+
endif()
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

cmake/cpm-config.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,4 @@ set(CPM_USE_LOCAL_PACKAGES ON)
3434
list(APPEND CMAKE_PREFIX_PATH ${CMAKE_CURRENT_LIST_DIR}/cpm)
3535

3636
find_package(doctest CONFIG REQUIRED)
37-
find_package(sdl3 CONFIG REQUIRED)
37+
find_package(sdl3 CONFIG REQUIRED)

cmake/cpm/doctest-config.cmake

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
cmake_minimum_required(VERSION 3.30)
2-
31
cpmaddpackage(
42
NAME
53
doctest
@@ -26,4 +24,4 @@ else()
2624
endif()
2725

2826
list(APPEND CMAKE_MODULE_PATH "${doctest_cmake_path}")
29-
message(STATUS "doctest (${doctest_source}) -> '${doctest_cmake_path}'")
27+
message(STATUS "doctest (${doctest_source}) -> '${doctest_cmake_path}'")

cmake/cpm/entt-config.cmake

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
CPMAddPackage(
2+
NAME entt
3+
GITHUB_REPOSITORY skypjack/entt
4+
GIT_TAG v3.16.0
5+
OPTIONS
6+
"ENTT_USE_LIBCPP ON"
7+
"ENTT_BUILD_TESTING OFF"
8+
"ENTT_BUILD_DOCS OFF"
9+
"ENTT_BUILD_BENCHMARK OFF"
10+
"ENTT_BUILD_EXAMPLES OFF"
11+
)

0 commit comments

Comments
 (0)