-
Notifications
You must be signed in to change notification settings - Fork 1.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
4 changed files
with
67 additions
and
4 deletions.
There are no files selected for viewing
44 changes: 44 additions & 0 deletions
44
recipes/eastl/all/patches/3.21.23-0001-cmake-shared-use-conan-add-install.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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) |
19 changes: 19 additions & 0 deletions
19
recipes/eastl/all/patches/3.21.23-0002-revert-c++14-constexpr.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 | ||
|