Makefile and cmake-conf: set CMAKE_SYSTEM_PROCESSOR

pull/2088/head
Tony Theodore 6 years ago
parent ed9dc43988
commit 473f697ba3

@ -735,6 +735,7 @@ build-only-$(1)_$(3): BUILD_$(if $(call seq,$(TARGET),$(BUILD)),NATIVE,CROSS) =
build-only-$(1)_$(3): $(if $(findstring posix,$(TARGET)),POSIX,WIN32)_THREADS = TRUE
build-only-$(1)_$(3): LIB_SUFFIX = $(if $(findstring shared,$(3)),dll,a)
build-only-$(1)_$(3): BITS = $(if $(findstring x86_64,$(3)),64,32)
build-only-$(1)_$(3): PROCESSOR = $(firstword $(call split,-,$(3)))
build-only-$(1)_$(3): BUILD_TYPE = $(if $(findstring debug,$(3) $($(1)_CONFIGURE_OPTS)),debug,release)
build-only-$(1)_$(3): BUILD_TYPE_SUFFIX = $(if $(findstring debug,$(3) $($(1)_CONFIGURE_OPTS)),d)
build-only-$(1)_$(3): INSTALL_STRIP_TOOLCHAIN = install$(if $(STRIP_TOOLCHAIN),-strip)

@ -23,6 +23,7 @@ define $(PKG)_BUILD
-DCMAKE_SHARED_BOOL=$(CMAKE_SHARED_BOOL) \
-DCMAKE_STATIC_BOOL=$(CMAKE_STATIC_BOOL) \
-DLIBTYPE=$(if $(BUILD_SHARED),SHARED,STATIC) \
-DPROCESSOR=$(PROCESSOR) \
-DPREFIX=$(PREFIX) \
-DTARGET=$(TARGET) \
-DBUILD=$(BUILD) \

@ -24,6 +24,7 @@ endif()
## General configuration
set(CMAKE_SYSTEM_NAME Windows)
set(CMAKE_SYSTEM_PROCESSOR @PROCESSOR@)
set(MSYS 1)
set(CMAKE_EXPORT_NO_PACKAGE_REGISTRY ON)
# Workaround for https://www.cmake.org/Bug/view.php?id=14075

Loading…
Cancel
Save