rboullard
02d1a0a13a
Conan Packaging / Package assimp/6.0.5 (push) Failing after 0s
Conan Packaging / Package cli11/2.6.2 (push) Failing after 0s
Conan Packaging / Package eabase/01082025 (push) Failing after 0s
Conan Packaging / Package flatbuffers/25.12.19-2026-02-06-03fffb2-bigfoot (push) Failing after 0s
Conan Packaging / Package glm/1.0.3 (push) Failing after 0s
Conan Packaging / Package imgui/1.92.8-docking (push) Failing after 1s
Conan Packaging / Package lodepng/cci.20260210 (push) Failing after 0s
Conan Packaging / Package meshoptimizer/1.2 (push) Failing after 0s
Conan Packaging / Package rapidhash/3.0 (push) Failing after 0s
Conan Packaging / Package spirv-cross/1.4.341.0 (push) Failing after 1s
Conan Packaging / Package spirv-headers/1.4.341.0 (push) Failing after 0s
Conan Packaging / Package unordered_dense/4.8.1 (push) Failing after 0s
Conan Packaging / Package spirv-tools/1.4.341.0 (push) Skipped
Conan Packaging / Package mimalloc/3.3.2 (push) Failing after 0s
Conan Packaging / Package mold/2.41.0 (push) Failing after 0s
Conan Packaging / Package pixelmatch-cpp17/1.0.3 (push) Failing after 0s
Conan Packaging / Package sqlite3/3.53.3 (push) Failing after 0s
Conan Packaging / Package stduuid/1.2.3 (push) Failing after 0s
Conan Packaging / Package vulkan-headers/1.4.341.0 (push) Failing after 0s
Conan Packaging / Package eastl/3.27.01 (push) Skipped
Conan Packaging / Package vulkan-memory-allocator/3.3.0 (push) Skipped
Conan Packaging / Package vulkan-utility-libraries/1.4.341.0 (push) Skipped
Conan Packaging / Package glslang/1.4.341.0 (push) Skipped
Conan Packaging / Package vulkan-validationlayers/1.4.341.0 (push) Skipped
Conan Packaging / Package shaderc/2026.1 (push) Skipped
45 lines
1.7 KiB
Diff
45 lines
1.7 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 0124dc7..c048fb8 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -70,16 +70,15 @@ target_include_directories(EASTL PUBLIC include)
|
|
#-------------------------------------------------------------------------------------------
|
|
# Dependencies
|
|
#-------------------------------------------------------------------------------------------
|
|
-FetchContent_Declare(
|
|
- EABase
|
|
- GIT_REPOSITORY https://github.com/electronicarts/EABase.git
|
|
- GIT_TAG 0699a15efdfd20b6cecf02153bfa5663decb653c
|
|
- GIT_SUBMODULES "" # This should be temporary until we update the cyclic submodule dependencies in EABase.
|
|
-)
|
|
-
|
|
-FetchContent_MakeAvailable(EABase)
|
|
-
|
|
-target_link_libraries(EASTL EABase)
|
|
+find_package(EABase REQUIRED CONFIG)
|
|
+target_link_libraries(EASTL EABase::EABase)
|
|
+
|
|
+if(BUILD_SHARED_LIBS)
|
|
+ target_compile_definitions(EASTL PUBLIC EASTL_DLL)
|
|
+ if(MSVC OR CYGWIN)
|
|
+ target_compile_definitions(EASTL PRIVATE "EASTL_API=__declspec(dllexport)")
|
|
+ endif()
|
|
+endif()
|
|
|
|
#-------------------------------------------------------------------------------------------
|
|
# Deprecations
|
|
@@ -98,6 +97,13 @@ endif()
|
|
#-------------------------------------------------------------------------------------------
|
|
# Installation
|
|
#-------------------------------------------------------------------------------------------
|
|
+include(GNUInstallDirs)
|
|
+install(TARGETS EASTL
|
|
+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
|
|
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
|
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
|
+install(DIRECTORY ${CMAKE_INSTALL_INCLUDEDIR}/EASTL DESTINATION include)
|
|
+
|
|
install(TARGETS EASTL DESTINATION lib)
|
|
install(DIRECTORY include/EASTL DESTINATION include)
|
|
|