use Patches and fix packaging
Conan Packaging / Package assimp/6.0.5 (push) Successful in 2m31s
Conan Packaging / Package cli11/2.6.2 (push) Successful in 25s
Conan Packaging / Package eabase/01082025 (push) Successful in 19s
Conan Packaging / Package flatbuffers/25.12.19-2026-02-06-03fffb2-bigfoot (push) Successful in 52s
Conan Packaging / Package glm/1.0.3 (push) Successful in 20s
Conan Packaging / Package imgui/1.92.8-docking (push) Successful in 35s
Conan Packaging / Package lodepng/cci.20260210 (push) Successful in 20s
Conan Packaging / Package pixelmatch-cpp17/1.0.3 (push) Successful in 18s
Conan Packaging / Package rapidhash/3.0 (push) Successful in 18s
Conan Packaging / Package eaassert/25082026 (push) Successful in 20s
Conan Packaging / Package eastl/3.27.01 (push) Successful in 33s
Conan Packaging / Package eathread/25082026 (push) Successful in 20s
Conan Packaging / Package spirv-tools/1.4.341.0 (push) Successful in 2m17s
Conan Packaging / Package vulkan-memory-allocator/3.3.0 (push) Successful in 21s
Conan Packaging / Package meshoptimizer/1.2 (push) Successful in 17s
Conan Packaging / Package mimalloc/3.3.2 (push) Successful in 21s
Conan Packaging / Package mold/2.41.0 (push) Successful in 5m10s
Conan Packaging / Package spirv-cross/1.4.341.0 (push) Successful in 53s
Conan Packaging / Package spirv-headers/1.4.341.0 (push) Successful in 18s
Conan Packaging / Package sqlite3/3.53.3 (push) Successful in 40s
Conan Packaging / Package stduuid/1.2.3 (push) Successful in 18s
Conan Packaging / Package unordered_dense/4.8.1 (push) Successful in 17s
Conan Packaging / Package vulkan-headers/1.4.341.0 (push) Successful in 16s
Conan Packaging / Package vulkan-utility-libraries/1.4.341.0 (push) Successful in 22s
Conan Packaging / Package eastdc/25082026 (push) Successful in 22s
Conan Packaging / Package glslang/1.4.341.0 (push) Successful in 2m41s
Conan Packaging / Package vulkan-validationlayers/1.4.341.0 (push) Successful in 6m33s
Conan Packaging / Package shaderc/2026.1 (push) Successful in 3m9s
Conan Packaging / Package assimp/6.0.5 (push) Successful in 2m31s
Conan Packaging / Package cli11/2.6.2 (push) Successful in 25s
Conan Packaging / Package eabase/01082025 (push) Successful in 19s
Conan Packaging / Package flatbuffers/25.12.19-2026-02-06-03fffb2-bigfoot (push) Successful in 52s
Conan Packaging / Package glm/1.0.3 (push) Successful in 20s
Conan Packaging / Package imgui/1.92.8-docking (push) Successful in 35s
Conan Packaging / Package lodepng/cci.20260210 (push) Successful in 20s
Conan Packaging / Package pixelmatch-cpp17/1.0.3 (push) Successful in 18s
Conan Packaging / Package rapidhash/3.0 (push) Successful in 18s
Conan Packaging / Package eaassert/25082026 (push) Successful in 20s
Conan Packaging / Package eastl/3.27.01 (push) Successful in 33s
Conan Packaging / Package eathread/25082026 (push) Successful in 20s
Conan Packaging / Package spirv-tools/1.4.341.0 (push) Successful in 2m17s
Conan Packaging / Package vulkan-memory-allocator/3.3.0 (push) Successful in 21s
Conan Packaging / Package meshoptimizer/1.2 (push) Successful in 17s
Conan Packaging / Package mimalloc/3.3.2 (push) Successful in 21s
Conan Packaging / Package mold/2.41.0 (push) Successful in 5m10s
Conan Packaging / Package spirv-cross/1.4.341.0 (push) Successful in 53s
Conan Packaging / Package spirv-headers/1.4.341.0 (push) Successful in 18s
Conan Packaging / Package sqlite3/3.53.3 (push) Successful in 40s
Conan Packaging / Package stduuid/1.2.3 (push) Successful in 18s
Conan Packaging / Package unordered_dense/4.8.1 (push) Successful in 17s
Conan Packaging / Package vulkan-headers/1.4.341.0 (push) Successful in 16s
Conan Packaging / Package vulkan-utility-libraries/1.4.341.0 (push) Successful in 22s
Conan Packaging / Package eastdc/25082026 (push) Successful in 22s
Conan Packaging / Package glslang/1.4.341.0 (push) Successful in 2m41s
Conan Packaging / Package vulkan-validationlayers/1.4.341.0 (push) Successful in 6m33s
Conan Packaging / Package shaderc/2026.1 (push) Successful in 3m9s
This commit is contained in:
@@ -2,7 +2,7 @@ import os
|
||||
|
||||
from conan import ConanFile
|
||||
from conan.tools.cmake import CMake, CMakeDeps, CMakeToolchain, cmake_layout
|
||||
from conan.tools.files import copy, get, replace_in_file, rmdir
|
||||
from conan.tools.files import apply_conandata_patches, copy, export_conandata_patches, get, rmdir
|
||||
|
||||
required_conan_version = ">=1.52.0"
|
||||
|
||||
@@ -26,6 +26,9 @@ class EAThreadConan(ConanFile):
|
||||
"fPIC": True,
|
||||
}
|
||||
|
||||
def export_sources(self):
|
||||
export_conandata_patches(self)
|
||||
|
||||
def config_options(self):
|
||||
if self.settings.os == "Windows":
|
||||
del self.options.fPIC
|
||||
@@ -48,39 +51,8 @@ class EAThreadConan(ConanFile):
|
||||
tc.generate()
|
||||
CMakeDeps(self).generate()
|
||||
|
||||
def _patch_sources(self):
|
||||
cmakelists = os.path.join(self.source_folder, "CMakeLists.txt")
|
||||
|
||||
replace_in_file(self, cmakelists, "include(CommonCppFlags)", "")
|
||||
|
||||
# The upstream CMakeLists.txt pulls EABase in via FetchContent from a pinned commit -
|
||||
# replace it with Conan's EABase, and add install rules (upstream has none).
|
||||
replace_in_file(
|
||||
self,
|
||||
cmakelists,
|
||||
"FetchContent_Declare(\n"
|
||||
" EABase\n"
|
||||
" GIT_REPOSITORY https://github.com/electronicarts/EABase.git\n"
|
||||
" GIT_TAG 123363eb82e132c0181ac53e43226d8ee76dea12\n"
|
||||
" GIT_SUBMODULES \"\" # This should be temporary until we update the cyclic submodule dependencies in EABase.\n"
|
||||
")\n"
|
||||
"\n"
|
||||
"FetchContent_MakeAvailable(EABase)\n"
|
||||
"\n"
|
||||
"target_link_libraries(EAThread EABase)\n",
|
||||
"find_package(EABase REQUIRED CONFIG)\n"
|
||||
"target_link_libraries(EAThread EABase::EABase)\n"
|
||||
"\n"
|
||||
"include(GNUInstallDirs)\n"
|
||||
"install(TARGETS EAThread\n"
|
||||
" RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}\n"
|
||||
" LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}\n"
|
||||
" ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})\n"
|
||||
"install(DIRECTORY include/eathread DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})\n",
|
||||
)
|
||||
|
||||
def build(self):
|
||||
self._patch_sources()
|
||||
apply_conandata_patches(self)
|
||||
cmake = CMake(self)
|
||||
cmake.configure()
|
||||
cmake.build()
|
||||
|
||||
Reference in New Issue
Block a user