Skip to content

Commit

Permalink
update 4.1.5
Browse files Browse the repository at this point in the history
  • Loading branch information
toge committed Sep 20, 2024
1 parent 20a6998 commit a4293c1
Show file tree
Hide file tree
Showing 4 changed files with 67 additions and 4 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a5870f8..d30aa93 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -70,17 +70,15 @@ target_include_directories(EASTL PUBLIC include)
#-------------------------------------------------------------------------------------------
# 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.
-)
-
-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,7 +96,11 @@ endif()
#-------------------------------------------------------------------------------------------
# Installation
#-------------------------------------------------------------------------------------------
-install(TARGETS EASTL DESTINATION lib)
+include(GNUInstallDirs)
+install(TARGETS EASTL
+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
install(DIRECTORY include/EASTL DESTINATION include)

if (MSVC)
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
diff --git a/include/EASTL/internal/config.h b/include/EASTL/internal/config.h
index 6c13117..9a31f1c 100644
--- a/include/EASTL/internal/config.h
+++ b/include/EASTL/internal/config.h
@@ -144,7 +144,13 @@
// http://en.wikipedia.org/wiki/C%2B%2B14#Relaxed_constexpr_restrictions
//
#if !defined(EA_CPP14_CONSTEXPR)
- #if defined(EA_COMPILER_CPP14_ENABLED)
+ #if defined(EA_COMPILER_MSVC_2015)
+ #define EA_CPP14_CONSTEXPR // not supported
+ #define EA_NO_CPP14_CONSTEXPR
+ #elif defined(__GNUC__) && (EA_COMPILER_VERSION < 9000) // Before GCC 9.0
+ #define EA_CPP14_CONSTEXPR // not supported
+ #define EA_NO_CPP14_CONSTEXPR
+ #elif defined(EA_COMPILER_CPP14_ENABLED)
#define EA_CPP14_CONSTEXPR constexpr
#else
#define EA_CPP14_CONSTEXPR // not supported
6 changes: 3 additions & 3 deletions recipes/roaring/all/conandata.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
sources:
"4.1.4":
url: "https://github.com/RoaringBitmap/CRoaring/archive/refs/tags/v4.1.4.tar.gz"
sha256: "fc15ac958e3c7778c6bed713fde849c09e8526f6274140d25ed4adc92331fa68"
"4.1.5":
url: "https://github.com/RoaringBitmap/CRoaring/archive/refs/tags/v4.1.5.tar.gz"
sha256: "7eafa9fd0dace499e80859867a6ba5a010816cf6e914dd9350ad1d44c0fc83eb"
"4.1.2":
url: "https://github.com/RoaringBitmap/CRoaring/archive/refs/tags/v4.1.2.tar.gz"
sha256: "dd9e9d9a28dcf9ba1622fb4a3a7b4d7f5e12732bb35e99a7cb028b7512731a7b"
Expand Down
2 changes: 1 addition & 1 deletion recipes/roaring/config.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
versions:
"4.1.4":
"4.1.5":
folder: all
"4.1.2":
folder: all
Expand Down

0 comments on commit a4293c1

Please sign in to comment.