diff options
| -rw-r--r-- | package/pkg-cmake.mk | 4 | ||||
| -rw-r--r-- | support/misc/Buildroot.cmake | 3 | ||||
| -rw-r--r-- | support/misc/toolchainfile.cmake.in | 2 | ||||
| -rw-r--r-- | toolchain/toolchain/toolchain.mk | 1 |
4 files changed, 9 insertions, 1 deletions
diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk index a7c8dc3b34..77fa1dc74c 100644 --- a/package/pkg-cmake.mk +++ b/package/pkg-cmake.mk @@ -87,6 +87,7 @@ define $(2)_CONFIGURE_CMDS PATH=$$(BR_PATH) \ $$($$(PKG)_CONF_ENV) $$(BR2_CMAKE) $$($$(PKG)_SRCDIR) \ -DCMAKE_TOOLCHAIN_FILE="$$(HOST_DIR)/usr/share/buildroot/toolchainfile.cmake" \ + -DCMAKE_MODULE_PATH="$$(HOST_DIR)/usr/share/buildroot" \ -DCMAKE_INSTALL_PREFIX="/usr" \ -DCMAKE_COLOR_MAKEFILE=OFF \ -DBUILD_DOC=OFF \ @@ -249,3 +250,6 @@ $(HOST_DIR)/usr/share/buildroot/toolchainfile.cmake: -e 's#@@CMAKE_BUILD_TYPE@@#$(if $(BR2_ENABLE_DEBUG),Debug,Release)#' \ $(TOPDIR)/support/misc/toolchainfile.cmake.in \ > $@ + +$(HOST_DIR)/usr/share/buildroot/Platform/Buildroot.cmake: + $(Q)$(INSTALL) -D -m 0644 support/misc/Buildroot.cmake $(@) diff --git a/support/misc/Buildroot.cmake b/support/misc/Buildroot.cmake new file mode 100644 index 0000000000..b0046b387b --- /dev/null +++ b/support/misc/Buildroot.cmake @@ -0,0 +1,3 @@ +include(Platform/Linux) +set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB32_PATHS FALSE) +set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE) diff --git a/support/misc/toolchainfile.cmake.in b/support/misc/toolchainfile.cmake.in index d4252dd9e7..5a42644e8f 100644 --- a/support/misc/toolchainfile.cmake.in +++ b/support/misc/toolchainfile.cmake.in @@ -10,7 +10,7 @@ # RELOCATED_HOST_DIR variable. string(REPLACE "/usr/share/buildroot" "" RELOCATED_HOST_DIR ${CMAKE_CURRENT_LIST_DIR}) -set(CMAKE_SYSTEM_NAME Linux) +set(CMAKE_SYSTEM_NAME Buildroot) set(CMAKE_SYSTEM_PROCESSOR @@CMAKE_SYSTEM_PROCESSOR@@) # Set the {C,CXX}FLAGS appended by CMake depending on the build type diff --git a/toolchain/toolchain/toolchain.mk b/toolchain/toolchain/toolchain.mk index b16db01501..e29837357a 100644 --- a/toolchain/toolchain/toolchain.mk +++ b/toolchain/toolchain/toolchain.mk @@ -38,3 +38,4 @@ endif $(eval $(virtual-package)) toolchain: $(HOST_DIR)/usr/share/buildroot/toolchainfile.cmake +toolchain: $(HOST_DIR)/usr/share/buildroot/Platform/Buildroot.cmake |
