diff options
| author | fuzzard <fuzzard@users.noreply.github.com> | 2023-06-17 18:02:01 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-17 18:02:01 +1000 |
| commit | 3ccd5dfc5277cbde6e15ace789c28075de556eea (patch) | |
| tree | a460260ef27748344cdaf328a6f2e3ca5c5f48fc | |
| parent | 22aa5f16de4de06ee08d14dc134068ddbdecd428 (diff) | |
| parent | f2eb5b2e6972d7bcfe9e19eecfb8a0b4f469b430 (diff) | |
Merge pull request #23395 from fuzzard/cmake_preptexturepacker
Native Flatbuffers update and minor cmake module update
| -rw-r--r-- | cmake/modules/buildtools/FindFlatC.cmake | 1 | ||||
| -rw-r--r-- | cmake/scripts/common/ModuleHelpers.cmake | 1 | ||||
| -rw-r--r-- | tools/depends/Makefile.include.in | 1 | ||||
| -rw-r--r-- | tools/depends/native/Toolchain-Native.cmake.in | 1 | ||||
| -rw-r--r-- | tools/depends/native/flatbuffers/FLATBUFFERS-VERSION | 4 | ||||
| -rw-r--r-- | tools/depends/native/flatbuffers/Makefile | 31 |
6 files changed, 12 insertions, 27 deletions
diff --git a/cmake/modules/buildtools/FindFlatC.cmake b/cmake/modules/buildtools/FindFlatC.cmake index bca17e8a05..f28477e7ff 100644 --- a/cmake/modules/buildtools/FindFlatC.cmake +++ b/cmake/modules/buildtools/FindFlatC.cmake @@ -28,6 +28,7 @@ if(NOT TARGET flatbuffers::flatc) endif() set(MODULE_LC flatbuffers) + set(LIB_TYPE native) # Duplicate URL may exist from FindFlatbuffers.cmake # unset otherwise it thinks we are providing a local file location and incorrect concatenation happens unset(FLATBUFFERS_URL) diff --git a/cmake/scripts/common/ModuleHelpers.cmake b/cmake/scripts/common/ModuleHelpers.cmake index 97a3901e0c..7365c914ee 100644 --- a/cmake/scripts/common/ModuleHelpers.cmake +++ b/cmake/scripts/common/ModuleHelpers.cmake @@ -158,6 +158,7 @@ macro(SETUP_BUILD_VARS) message(STATUS "PROJECTSOURCE: ${PROJECTSOURCE}") message(STATUS "${MODULE}_URL: ${${MODULE}_URL}") endif() + unset(LIB_TYPE) endmacro() macro(CLEAR_BUILD_VARS) diff --git a/tools/depends/Makefile.include.in b/tools/depends/Makefile.include.in index 691cc253e9..e91bf152f4 100644 --- a/tools/depends/Makefile.include.in +++ b/tools/depends/Makefile.include.in @@ -98,6 +98,7 @@ NM_FOR_BUILD=@NM_FOR_BUILD@ STRIP_FOR_BUILD=@STRIP_FOR_BUILD@ READELF_FOR_BUILD=@READELF_FOR_BUILD@ OBJDUMP_FOR_BUILD=@OBJDUMP_FOR_BUILD@ +CMAKE_FOR_BUILD=@prefix@/@tool_dir@/bin/cmake -DCMAKE_TOOLCHAIN_FILE=$(NATIVEPREFIX)/share/Toolchain-Native.cmake -DCMAKE_INSTALL_PREFIX=$(NATIVEPREFIX) NATIVE_CFLAGS=@host_includes@ -I@prefix@/@tool_dir@/include NATIVE_LDFLAGS=@host_includes@ -L@prefix@/@tool_dir@/lib diff --git a/tools/depends/native/Toolchain-Native.cmake.in b/tools/depends/native/Toolchain-Native.cmake.in index a597100518..7584542da8 100644 --- a/tools/depends/native/Toolchain-Native.cmake.in +++ b/tools/depends/native/Toolchain-Native.cmake.in @@ -5,6 +5,7 @@ set(TARBALL_DIR "@use_tarballs@") set(OS "@build_os@") set(CMAKE_SYSTEM_PROCESSOR @host_cpu@) set(CPU "@use_buildcpu@") +set(ARCH_DEFINES "@NATIVE_ARCH_DEFINES@") if(OS STREQUAL linux) set(CMAKE_SYSTEM_NAME Linux) diff --git a/tools/depends/native/flatbuffers/FLATBUFFERS-VERSION b/tools/depends/native/flatbuffers/FLATBUFFERS-VERSION new file mode 100644 index 0000000000..5ccaa80c2d --- /dev/null +++ b/tools/depends/native/flatbuffers/FLATBUFFERS-VERSION @@ -0,0 +1,4 @@ +LIBNAME=flatbuffers +VERSION=23.3.3 +ARCHIVE=$(LIBNAME)-$(VERSION).tar.gz +SHA512=4066c94f2473c7ea16917d29a613e16f840a329089c88e0bdbdb999aef3442ba00abfd2aa92266fa9c067e399dc88e6f0ccac40dc151378857e665638e78bbf0 diff --git a/tools/depends/native/flatbuffers/Makefile b/tools/depends/native/flatbuffers/Makefile index 2d55d7e583..4d2f8cec31 100644 --- a/tools/depends/native/flatbuffers/Makefile +++ b/tools/depends/native/flatbuffers/Makefile @@ -1,15 +1,7 @@ -include ../../Makefile.include +include ../../Makefile.include FLATBUFFERS-VERSION ../../download-files.include PREFIX=$(NATIVEPREFIX) PLATFORM=$(NATIVEPLATFORM) -DEPS =../../Makefile.include Makefile ../../download-files.include - -# lib name, version -LIBNAME=flatbuffers -VERSION=23.3.3 -SOURCE=$(LIBNAME)-$(VERSION) -ARCHIVE=$(SOURCE).tar.gz -SHA512=4066c94f2473c7ea16917d29a613e16f840a329089c88e0bdbdb999aef3442ba00abfd2aa92266fa9c067e399dc88e6f0ccac40dc151378857e665638e78bbf0 -include ../../download-files.include +DEPS =../../Makefile.include Makefile FLATBUFFERS-VERSION ../../download-files.include APP=$(PLATFORM)/build-cmake/flatc @@ -17,16 +9,7 @@ APP=$(PLATFORM)/build-cmake/flatc # When we go c++17, flatbuffers has FLATBUFFERS_BUILD_CPP17 to enable # If we bump cmake min req to 3.16, enable FLATBUFFERS_ENABLE_PCH -ifeq ($(USE_CCACHE), yes) - LAUNCHER=-DCMAKE_CXX_COMPILER_LAUNCHER=$(CCACHE) -endif - -# Only this package uses CMake for build on native at the moment, -# so there is no separate toolchain file. Still we have to unset -# the CMAKE_TOOLCHAIN_FILE, which is part of $(CMAKE) and set to -# the target toolchain file. -CMAKE_OPTIONS := -DCMAKE_TOOLCHAIN_FILE= \ - -DCMAKE_BUILD_TYPE=Release \ +CMAKE_OPTIONS := -DCMAKE_BUILD_TYPE=Release \ -DFLATBUFFERS_CODE_COVERAGE=OFF \ -DFLATBUFFERS_BUILD_TESTS=OFF \ -DFLATBUFFERS_INSTALL=ON \ @@ -35,12 +18,6 @@ CMAKE_OPTIONS := -DCMAKE_TOOLCHAIN_FILE= \ -DFLATBUFFERS_BUILD_FLATHASH=OFF \ -DFLATBUFFERS_BUILD_GRPCTEST=OFF \ -DFLATBUFFERS_BUILD_SHAREDLIB=OFF \ - -DCMAKE_C_COMPILER="$(CC_BINARY_FOR_BUILD)" \ - -DCMAKE_CXX_COMPILER="$(CXX_BINARY_FOR_BUILD)" \ - $(LAUNCHER) \ - -DCMAKE_C_FLAGS="$(NATIVE_CFLAGS)" \ - -DCMAKE_CXX_FLAGS="$(NATIVE_CXXFLAGS)" \ - -DCMAKE_EXE_LINKER_FLAGS="$(NATIVE_LDFLAGS)" \ $(CMAKE_OPTIONS) BUILDDIR = $(PLATFORM)/build-cmake # 'build' conflicts with file BUILD on case-insensitive FS @@ -51,7 +28,7 @@ $(PLATFORM): $(DEPS) | $(TARBALLS_LOCATION)/$(ARCHIVE).$(HASH_TYPE) rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM) cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) mkdir -p $(BUILDDIR) - cd $(BUILDDIR); $(CMAKE) $(CMAKE_OPTIONS) .. + cd $(BUILDDIR); $(CMAKE_FOR_BUILD) $(CMAKE_OPTIONS) .. $(APP): $(PLATFORM) $(MAKE) -C $(BUILDDIR) |