early-access version 2853
This commit is contained in:
75
externals/vcpkg/ports/eastl/fix_cmake_install.patch
vendored
Executable file
75
externals/vcpkg/ports/eastl/fix_cmake_install.patch
vendored
Executable file
@@ -0,0 +1,75 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index e8700dc..6d3e2f1 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -4,12 +4,17 @@
|
||||
cmake_minimum_required(VERSION 3.1)
|
||||
project(EASTL CXX)
|
||||
|
||||
+include(GNUInstallDirs)
|
||||
+include(CMakePackageConfigHelpers)
|
||||
+
|
||||
#-------------------------------------------------------------------------------------------
|
||||
# Options
|
||||
#-------------------------------------------------------------------------------------------
|
||||
option(EASTL_BUILD_BENCHMARK "Enable generation of build files for benchmark" OFF)
|
||||
option(EASTL_BUILD_TESTS "Enable generation of build files for tests" OFF)
|
||||
|
||||
+find_package(EABase CONFIG REQUIRED)
|
||||
+
|
||||
#-------------------------------------------------------------------------------------------
|
||||
# Compiler Flags
|
||||
#-------------------------------------------------------------------------------------------
|
||||
@@ -41,7 +46,10 @@ add_definitions(-DEASTL_OPENSOURCE=1)
|
||||
#-------------------------------------------------------------------------------------------
|
||||
# Include dirs
|
||||
#-------------------------------------------------------------------------------------------
|
||||
-target_include_directories(EASTL PUBLIC include)
|
||||
+target_include_directories(EASTL PUBLIC
|
||||
+ $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>
|
||||
+ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
|
||||
+ )
|
||||
|
||||
#-------------------------------------------------------------------------------------------
|
||||
# Dependencies
|
||||
@@ -50,5 +58,39 @@ if (NOT TARGET EABase)
|
||||
add_subdirectory(test/packages/EABase)
|
||||
endif()
|
||||
|
||||
-target_link_libraries(EASTL EABase)
|
||||
+target_link_libraries(EASTL PUBLIC EABase)
|
||||
+
|
||||
+# create and install an export set for eabase target as EABase::EABase
|
||||
+set(EASTL_CMAKE_CONFIG_DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/EASTL")
|
||||
+
|
||||
+configure_package_config_file(
|
||||
+ EASTLConfig.cmake.in
|
||||
+ ${CMAKE_CURRENT_BINARY_DIR}/EASTLConfig.cmake
|
||||
+ INSTALL_DESTINATION ${EASTL_CMAKE_CONFIG_DESTINATION}
|
||||
+)
|
||||
+
|
||||
+# create and install an export set for Terra target as Terra
|
||||
+install(
|
||||
+ TARGETS EASTL EXPORT EASTLTargets
|
||||
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||
+)
|
||||
+
|
||||
+
|
||||
+install(EXPORT EASTLTargets DESTINATION ${EASTL_CMAKE_CONFIG_DESTINATION})
|
||||
+
|
||||
+write_basic_package_version_file(
|
||||
+ "${CMAKE_CURRENT_BINARY_DIR}/EASTLConfigVersion.cmake"
|
||||
+ VERSION 3.16.05
|
||||
+ COMPATIBILITY SameMajorVersion
|
||||
+)
|
||||
+
|
||||
+install(TARGETS EASTL LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}")
|
||||
+install(DIRECTORY "include/" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
|
||||
+
|
||||
+install(
|
||||
+ FILES
|
||||
+ "${CMAKE_CURRENT_BINARY_DIR}/EASTLConfig.cmake"
|
||||
+ "${CMAKE_CURRENT_BINARY_DIR}/EASTLConfigVersion.cmake"
|
||||
+ DESTINATION ${EASTL_CMAKE_CONFIG_DESTINATION}
|
||||
+)
|
||||
|
||||
Reference in New Issue
Block a user