rboullard
7ffd3a13ed
Conan Packaging / Package assimp/6.0.5 (push) Successful in 2m3s
Conan Packaging / Package cli11/2.6.2 (push) Successful in 26s
Conan Packaging / Package eabase/01082025 (push) Successful in 20s
Conan Packaging / Package flatbuffers/25.12.19-2026-02-06-03fffb2-bigfoot (push) Successful in 59s
Conan Packaging / Package glm/1.0.3 (push) Successful in 19s
Conan Packaging / Package lodepng/cci.20260210 (push) Successful in 18s
Conan Packaging / Package meshoptimizer/1.2 (push) Successful in 20s
Conan Packaging / Package mimalloc/3.3.2 (push) Successful in 21s
Conan Packaging / Package mold/2.41.0 (push) Successful in 4m59s
Conan Packaging / Package pixelmatch-cpp17/1.0.3 (push) Successful in 21s
Conan Packaging / Package rapidhash/3.0 (push) Successful in 37s
Conan Packaging / Package spirv-headers/1.4.341.0 (push) Successful in 19s
Conan Packaging / Package sqlite3/3.53.3 (push) Successful in 40s
Conan Packaging / Package stduuid/1.2.3 (push) Successful in 21s
Conan Packaging / Package imgui/1.92.8-docking (push) Successful in 25s
Conan Packaging / Package spirv-cross/1.4.341.0 (push) Successful in 53s
Conan Packaging / Package unordered_dense/4.8.1 (push) Successful in 18s
Conan Packaging / Package vulkan-headers/1.4.341.0 (push) Successful in 19s
Conan Packaging / Package eathread/25082026 (push) Successful in 19s
Conan Packaging / Package eaassert/25082026 (push) Successful in 23s
Conan Packaging / Package eastl/3.27.01 (push) Successful in 18s
Conan Packaging / Package spirv-tools/1.4.341.0 (push) Successful in 2m21s
Conan Packaging / Package vulkan-memory-allocator/3.3.0 (push) Successful in 19s
Conan Packaging / Package vulkan-utility-libraries/1.4.341.0 (push) Successful in 23s
Conan Packaging / Package eastdc/25082026 (push) Successful in 24s
Conan Packaging / Package glslang/1.4.341.0 (push) Successful in 2m44s
Conan Packaging / Package vulkan-validationlayers/1.4.341.0 (push) Successful in 5m56s
Conan Packaging / Package shaderc/2026.1 (push) Successful in 3m25s
Reviewed-on: #4 Co-authored-by: Romain BOULLARD <romain.boullard@protonmail.com>
41 lines
1.9 KiB
Diff
41 lines
1.9 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 7884456..6d51ebc 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -14,7 +14,6 @@ option(EATHREAD_BUILD_TESTS "Enable generation of build files for tests" OFF)
|
|
# Compiler Flags (TODO: do we really need this?)
|
|
#-------------------------------------------------------------------------------------------
|
|
set (CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH};${CMAKE_CURRENT_SOURCE_DIR}/scripts/Cmake" CACHE INTERNAL "Inject path to CommonCppFlags")
|
|
-include(CommonCppFlags)
|
|
|
|
#-------------------------------------------------------------------------------------------
|
|
# Library definition
|
|
@@ -36,16 +35,18 @@ target_include_directories(EAThread PUBLIC include)
|
|
#-------------------------------------------------------------------------------------------
|
|
# Package Dependencies
|
|
#-------------------------------------------------------------------------------------------
|
|
-FetchContent_Declare(
|
|
- EABase
|
|
- GIT_REPOSITORY https://github.com/electronicarts/EABase.git
|
|
- GIT_TAG 123363eb82e132c0181ac53e43226d8ee76dea12
|
|
- GIT_SUBMODULES "" # This should be temporary until we update the cyclic submodule dependencies in EABase.
|
|
-)
|
|
+find_package(EABase REQUIRED CONFIG)
|
|
+target_link_libraries(EAThread EABase::EABase)
|
|
|
|
-FetchContent_MakeAvailable(EABase)
|
|
-
|
|
-target_link_libraries(EAThread EABase)
|
|
+#-------------------------------------------------------------------------------------------
|
|
+# Installation
|
|
+#-------------------------------------------------------------------------------------------
|
|
+include(GNUInstallDirs)
|
|
+install(TARGETS EAThread
|
|
+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
|
|
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
|
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
|
+install(DIRECTORY include/eathread DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
|
|
|
|
if(EATHREAD_BUILD_TESTS)
|
|
add_subdirectory(test)
|