CMake infrastructure refactoring

Signed-off-by Samuel Martin <[email protected]>

Cc Arnout Vandecappelle <[email protected]>

---
changes v1 -> v2
- new patch

---
 package/pkg-cmake.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

package/pkg-cmake.mk +1 -1

index bf3db90..edda14a 100644
@@ -160,7 +160,7 @@ host-cmake-package = $(call inner-cmake-package,host-$(pkgname),$(call UPPERCASE
 
 $(HOST_DIR)/usr/share/buildroot/toolchainfile.cmake:
 	@mkdir -p $(@D)
-	@echo -en "\
+	@printf "\
 	set(CMAKE_SYSTEM_NAME Linux)\n\
 	set(CMAKE_C_COMPILER $(TARGET_CC_NOCCACHE))\n\
 	set(CMAKE_CXX_COMPILER $(TARGET_CXX_NOCCACHE))\n\

Quoted 1 line

Quoted 1 line

Quoted 1 line

Quoted 1 line

"Arnout" == Arnout Vandecappelle <[email protected]> writes:

Quoted 2 lines · Samuel Martin

Signed-off-by Samuel Martin <[email protected]>

Cc Arnout Vandecappelle <[email protected]>

Commit message could have been clarified with

printf is POSIX-compliant, echo -e is not.

Since Buildroot does not support space in paths (at least neither in the Buildroot installation location, nor in the output directory).

Signed-off-by Samuel Martin <[email protected]>

---
changes v1 -> v2:
- new patch

---
 package/pkg-cmake.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

package/pkg-cmake.mk +3 -3

index edda14a..963a423 100644
@@ -167,10 +167,10 @@ $(HOST_DIR)/usr/share/buildroot/toolchainfile.cmake:
 	set(CMAKE_C_FLAGS \"\$${CMAKE_C_FLAGS} $(TARGET_CFLAGS)\" CACHE STRING \"Buildroot CFLAGS\" FORCE)\n\
 	set(CMAKE_CXX_FLAGS \"\$${CMAKE_CXX_FLAGS} $(TARGET_CXXFLAGS)\" CACHE STRING \"Buildroot CXXFLAGS\" FORCE)\n\
 	set(CMAKE_INSTALL_SO_NO_EXE 0)\n\
-	set(CMAKE_PROGRAM_PATH \"$(HOST_DIR)/usr/bin\")\n\
-	set(CMAKE_FIND_ROOT_PATH \"$(STAGING_DIR)\")\n\
+	set(CMAKE_PROGRAM_PATH $(HOST_DIR)/usr/bin)\n\
+	set(CMAKE_FIND_ROOT_PATH $(STAGING_DIR))\n\
 	set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)\n\
 	set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)\n\
 	set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)\n\
-	set(ENV{PKG_CONFIG_SYSROOT_DIR} \"$(STAGING_DIR)\")\n\
+	set(ENV{PKG_CONFIG_SYSROOT_DIR} $(STAGING_DIR))\n\
 	" > $@

Signed-off-by Samuel Martin <[email protected]>

Cc Arnout Vandecappelle <[email protected]>

---
changes v1 -> v2:
- new patch

---
 package/pkg-cmake.mk | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

package/pkg-cmake.mk +0 -0

index 963a423..af8ecf5 100644

package/pkg-cmake.mk +12 -14

+set(CMAKE_C_FLAGS "$${CMAKE_C_FLAGS} $(TARGET_CFLAGS)" CACHE STRING "Buildroot CFLAGS" FORCE)
+set(CMAKE_CXX_FLAGS "$${CMAKE_CXX_FLAGS} $(TARGET_CXXFLAGS)" CACHE STRING "Buildroot CXXFLAGS" FORCE)
+set(CMAKE_INSTALL_SO_NO_EXE 0)
+set(CMAKE_PROGRAM_PATH $(HOST_DIR)/usr/bin)
+set(CMAKE_FIND_ROOT_PATH $(STAGING_DIR))
+set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+set(ENV{PKG_CONFIG_SYSROOT_DIR} $(STAGING_DIR))
+endef
+
 $(HOST_DIR)/usr/share/buildroot/toolchainfile.cmake:
 	@mkdir -p $(@D)
-	@printf "\
-	set(CMAKE_SYSTEM_NAME Linux)\n\
-	set(CMAKE_C_COMPILER $(TARGET_CC_NOCCACHE))\n\
-	set(CMAKE_CXX_COMPILER $(TARGET_CXX_NOCCACHE))\n\
-	set(CMAKE_C_FLAGS \"\$${CMAKE_C_FLAGS} $(TARGET_CFLAGS)\" CACHE STRING \"Buildroot CFLAGS\" FORCE)\n\
-	set(CMAKE_CXX_FLAGS \"\$${CMAKE_CXX_FLAGS} $(TARGET_CXXFLAGS)\" CACHE STRING \"Buildroot CXXFLAGS\" FORCE)\n\
-	set(CMAKE_INSTALL_SO_NO_EXE 0)\n\
-	set(CMAKE_PROGRAM_PATH $(HOST_DIR)/usr/bin)\n\
-	set(CMAKE_FIND_ROOT_PATH $(STAGING_DIR))\n\
-	set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)\n\
-	set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)\n\
-	set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)\n\
-	set(ENV{PKG_CONFIG_SYSROOT_DIR} $(STAGING_DIR))\n\
-	" > $@
+	@printf '$(subst $(sep),\n,$(TOOLCHAINFILE_CMAKE))' > $@

The patch allows sharing or moving the toolchains.

This is a step toward making the toolchain/sdk relocatable.

Closes #6818

Signed-off-by Samuel Martin <[email protected]>

Cc Uwe Strempel <[email protected]>

Cc Arnout Vandecappelle <[email protected]>

---
changes v1 -> v2:
- rebase
- use CMAKE_CURRENT_LIST_DIR instead of get_filename_component()
- rewrite subst call in a more natural way (Arnout)

---
 package/pkg-cmake.mk | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

package/pkg-cmake.mk +0 -0

index af8ecf5..b2ac2df 100644

package/pkg-cmake.mk +4 -3

+set(CMAKE_CXX_COMPILER $(subst $(HOST_DIR),$${_HOST_DIR},$(TARGET_CROSS))g++)
 set(CMAKE_C_FLAGS "$${CMAKE_C_FLAGS} $(TARGET_CFLAGS)" CACHE STRING "Buildroot CFLAGS" FORCE)
 set(CMAKE_CXX_FLAGS "$${CMAKE_CXX_FLAGS} $(TARGET_CXXFLAGS)" CACHE STRING "Buildroot CXXFLAGS" FORCE)
 set(CMAKE_INSTALL_SO_NO_EXE 0)
-set(CMAKE_PROGRAM_PATH $(HOST_DIR)/usr/bin)
-set(CMAKE_FIND_ROOT_PATH $(STAGING_DIR))
+set(CMAKE_PROGRAM_PATH $${_HOST_DIR}/usr/bin)
+set(CMAKE_FIND_ROOT_PATH $${_HOST_DIR}/$(STAGING_SUBDIR))
 set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
 set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
 set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-set(ENV{PKG_CONFIG_SYSROOT_DIR} $(STAGING_DIR))
+set(ENV{PKG_CONFIG_SYSROOT_DIR} $${_HOST_DIR}/$(STAGING_SUBDIR))
 endef
 
 $(HOST_DIR)/usr/share/buildroot/toolchainfile.cmake:

This patch updates the generated toolchainfile.cmake to use ccache.

When toolchainfile.cmake is used inside Buildroot, using ccache during the build is driven by a CMake knob: USE_CCACHE, automatically set by the cmake-package infrastructure and reflecting the BR2_CCACHE value.

Since this toolchainefile.cmake file can be used outside Buildroot, and this file also set a couple of things (among these: the sysroot cflag, some pkg-config environment variables), it is important to set the compiler variables as well to keep the consistency of the cross-compilation configuration.
So, when it is used outside Buildroot, using ccache for the build is driven by the ccache program availability.

Note that using ccache for the build is achieved by setting the *_ARG1 CMake variables to let CMake use ccache without failing in detecting the compiler.

Signed-off-by Samuel Martin <[email protected]>

Signed-off-by Luca Ceresoli <[email protected]>

Cc Luca Ceresoli <[email protected]>

---
changes v2 -> v3 (Samuel):
- rebase
- inline the -DUSE_CCACHE=... in the configure commands.
- always set the compiler variables, even when called for outside Buildroot.
- update commit message

changes v1 -> v2 (Luca):
- totally reimplemented based on Samuel's suggestion;
- added dependency on host-ccache for cmake packages if ccache is enabled.

---
 package/pkg-cmake.mk | 35 +++++++++++++++++++++++++++++++++--
 1 file changed, 33 insertions(+), 2 deletions(-)

package/pkg-cmake.mk +8 -2

index b2ac2df..a032426 100644
@@ -66,6 +66,7 @@ define $(2)_CONFIGURE_CMDS
 		-DCMAKE_INSTALL_PREFIX="/usr" \
 		-DCMAKE_COLOR_MAKEFILE=OFF \
 		-DBUILD_SHARED_LIBS=$(if $(BR2_PREFER_STATIC_LIB),OFF,ON) \
+		-DUSE_CCACHE=$(if $(BR2_CCACHE),ON,OFF) \
 		$$($$(PKG)_CONF_OPT) \
 	)
 endef

@@ -83,6 +84,7 @@ define $(2)_CONFIGURE_CMDS
 		-DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY="BOTH" \
 		-DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE="BOTH" \
 		-DCMAKE_INSTALL_PREFIX="$$(HOST_DIR)/usr" \
+		-DUSE_CCACHE=$(if $(BR2_CCACHE),ON,OFF) \
 		$$($$(PKG)_CONF_OPT) \
 	)
 endef

@@ -161,8 +163,6 @@ host-cmake-package = $(call inner-cmake-package,host-$(pkgname),$(call UPPERCASE
 define TOOLCHAINFILE_CMAKE
 string(REPLACE /usr/share/buildroot "" _HOST_DIR $${CMAKE_CURRENT_LIST_DIR})
 set(CMAKE_SYSTEM_NAME Linux)
-set(CMAKE_C_COMPILER $(subst $(HOST_DIR),$${_HOST_DIR},$(TARGET_CROSS))gcc)
-set(CMAKE_CXX_COMPILER $(subst $(HOST_DIR),$${_HOST_DIR},$(TARGET_CROSS))g++)
 set(CMAKE_C_FLAGS "$${CMAKE_C_FLAGS} $(TARGET_CFLAGS)" CACHE STRING "Buildroot CFLAGS" FORCE)
 set(CMAKE_CXX_FLAGS "$${CMAKE_CXX_FLAGS} $(TARGET_CXXFLAGS)" CACHE STRING "Buildroot CXXFLAGS" FORCE)
 set(CMAKE_INSTALL_SO_NO_EXE 0)

@@ -172,6 +172,37 @@ set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
 set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
 set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
 set(ENV{PKG_CONFIG_SYSROOT_DIR} $${_HOST_DIR}/$(STAGING_SUBDIR))
+# This toolchain file can be used both inside and outside Buildroot.
+# * When used inside Buildroot, ccache support is explicitly driven using the
+#   USE_CCACHE variable.
+# * When used outside Buildroot (i.e. when USE_CCACHE is not defined), ccache
+#   support is automatically enabled if the ccache program is available.
+if(DEFINED USE_CCACHE)

package/pkg-cmake.mk +13 -0

+	if(CCACHE)
+		set(CMAKE_ASM_COMPILER $(subst $(HOST_DIR),$${_HOST_DIR},$(TARGET_CROSS))gcc)
+		set(CMAKE_C_COMPILER $${CCACHE})
+		set(CMAKE_CXX_COMPILER $${CCACHE})
+		set(CMAKE_C_COMPILER_ARG1 $(subst $(HOST_DIR),$${_HOST_DIR},$(TARGET_CROSS))gcc)
+		set(CMAKE_CXX_COMPILER_ARG1 $(subst $(HOST_DIR),$${_HOST_DIR},$(TARGET_CROSS))g++)
+		message(STATUS "ccache program has been found and will be used for the build.")
+		message(STATUS "  To disable ccache, add -DUSE_CCACHE=OFF on the cmake command line.")
+	else()
+		set(CMAKE_C_COMPILER $(subst $(HOST_DIR),$${_HOST_DIR},$(TARGET_CROSS))gcc)
+		set(CMAKE_CXX_COMPILER $(subst $(HOST_DIR),$${_HOST_DIR},$(TARGET_CROSS))g++)
+	endif()
+endif()
 endef
 
 $(HOST_DIR)/usr/share/buildroot/toolchainfile.cmake:

Quoted 6 lines · Samuel Martin

This patch updates the generated toolchainfile.cmake to use ccache.

When toolchainfile.cmake is used inside Buildroot, using ccache during the build is driven by a CMake knob: USE_CCACHE, automatically set by the cmake-package infrastructure and reflecting the BR2_CCACHE value.

Quoted 7 lines

Since this toolchainefile.cmake file can be used outside Buildroot, and this file also set a couple of things (among these: the sysroot cflag, some pkg-config environment variables), it is important to set the compiler variables as well to keep the consistency of the cross-compilation configuration.
So, when it is used outside Buildroot, using ccache for the build is driven by the ccache program availability.

I don't understand this. We can just use br-ccache when it's called from
outside buildroot as well, no?

Quoted 66 lines

Note that using ccache for the build is achieved by setting the *_ARG1/cc CMake variables to let CMake use ccache without failing in detecting the compiler.

Signed-off-by Samuel Martin <[email protected]>

Signed-off-by Luca Ceresoli <[email protected]>

Cc Luca Ceresoli <[email protected]>

---
changes v2 -> v3 (Samuel):
- rebase
- inline the -DUSE_CCACHE=... in the configure commands.
- always set the compiler variables, even when called for outside Buildroot.
- update commit message

changes v1 -> v2 (Luca):
- totally reimplemented based on Samuel's suggestion;
- added dependency on host-ccache for cmake packages if ccache is enabled.

---
 package/pkg-cmake.mk | 35 +++++++++++++++++++++++++++++++++--
 1 file changed, 33 insertions(+), 2 deletions(-)

package/pkg-cmake.mk +8 -2

index b2ac2df..a032426 100644
@@ -66,6 +66,7 @@ define $(2)_CONFIGURE_CMDS
              -DCMAKE_INSTALL_PREFIX="/usr" \
              -DCMAKE_COLOR_MAKEFILE=OFF \
              -DBUILD_SHARED_LIBS=$(if $(BR2_PREFER_STATIC_LIB),OFF,ON) \
+             -DUSE_CCACHE=$(if $(BR2_CCACHE),ON,OFF) \
              $$($$(PKG)_CONF_OPT) \
      )
 endef

@@ -83,6 +84,7 @@ define $(2)_CONFIGURE_CMDS
              -DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY="BOTH" \
              -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE="BOTH" \
              -DCMAKE_INSTALL_PREFIX="$$(HOST_DIR)/usr" \
+             -DUSE_CCACHE=$(if $(BR2_CCACHE),ON,OFF) \
              $$($$(PKG)_CONF_OPT) \
      )
 endef

@@ -161,8 +163,6 @@ host-cmake-package = $(call inner-cmake-package,host-$(pkgname),$(call UPPERCASE
 define TOOLCHAINFILE_CMAKE
 string(REPLACE /usr/share/buildroot "" _HOST_DIR $${CMAKE_CURRENT_LIST_DIR})
 set(CMAKE_SYSTEM_NAME Linux)
-set(CMAKE_C_COMPILER $(subst $(HOST_DIR),$${_HOST_DIR},$(TARGET_CROSS))gcc)
-set(CMAKE_CXX_COMPILER $(subst $(HOST_DIR),$${_HOST_DIR},$(TARGET_CROSS))g++)
 set(CMAKE_C_FLAGS "$${CMAKE_C_FLAGS} $(TARGET_CFLAGS)" CACHE STRING "Buildroot CFLAGS" FORCE)
 set(CMAKE_CXX_FLAGS "$${CMAKE_CXX_FLAGS} $(TARGET_CXXFLAGS)" CACHE STRING "Buildroot CXXFLAGS" FORCE)
 set(CMAKE_INSTALL_SO_NO_EXE 0)

@@ -172,6 +172,37 @@ set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
 set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
 set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
 set(ENV{PKG_CONFIG_SYSROOT_DIR} $${_HOST_DIR}/$(STAGING_SUBDIR))
+# This toolchain file can be used both inside and outside Buildroot.
+# * When used inside Buildroot, ccache support is explicitly driven using the
+#   USE_CCACHE variable.
+# * When used outside Buildroot (i.e. when USE_CCACHE is not defined), ccache
+#   support is automatically enabled if the ccache program is available.
+if(DEFINED USE_CCACHE)

package/pkg-cmake.mk set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) · line 190

Quoted 10 lines

package/pkg-cmake.mk +10 -0

+     if(USE_CCACHE)
+             set(CMAKE_ASM_COMPILER $(subst $(HOST_DIR),$${_HOST_DIR},$(TARGET_CROSS))gcc)
+             set(CMAKE_C_COMPILER $${_HOST_DIR}/usr/bin/ccache)
+             set(CMAKE_CXX_COMPILER $${_HOST_DIR}/usr/bin/ccache)
+             set(CMAKE_C_COMPILER_ARG1 $(subst $(HOST_DIR),$${_HOST_DIR},$(TARGET_CROSS))gcc)
+             set(CMAKE_CXX_COMPILER_ARG1 $(subst $(HOST_DIR),$${_HOST_DIR},$(TARGET_CROSS))g++)
+     else()
+             set(CMAKE_C_COMPILER $(subst $(HOST_DIR),$${_HOST_DIR},$(TARGET_CROSS))gcc)
+             set(CMAKE_CXX_COMPILER $(subst $(HOST_DIR),$${_HOST_DIR},$(TARGET_CROSS))g++)
+     endif()

I don't see why this USE_CCACHE condition should be dynamic. If
BR2_CCACHE is set, then we can _always_ use ccache, no? So:

ifeq($(BR2_CCACHE),y)
define TOOLCHAINFILE_CMAKE_CCACHE set(CMAKE_C_COMPILER $${_HOST_DIR}/usr/bin/ccache) set(CMAKE_CXX_COMPILER $${_HOST_DIR}/usr/bin/ccache)
...
endef
else # BR2_CCACHE
define TOOLCHAINFILE_CMAKE_CCACHE
...
endef
endif

package/pkg-cmake.mk set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) · line 192

Quoted 3 lines

package/pkg-cmake.mk +2 -0

+else()
+     find_program(CCACHE ccache)

Note that if we don't set PATH explicitly to point to the host dir, this
will point to the system's ccache instead of buildroot ccache.

Signed-off-by Samuel Martin <[email protected]>

---
changes v1 -> v2:
- new patch

---
 package/pkg-cmake.mk | 8 ++++++++
 1 file changed, 8 insertions(+)

package/pkg-cmake.mk +7 -0

index a032426..19f7843 100644
@@ -161,17 +161,25 @@ host-cmake-package = $(call inner-cmake-package,host-$(pkgname),$(call UPPERCASE
 ################################################################################
 
 define TOOLCHAINFILE_CMAKE
+#
+# Automatically generated file; DO NOT EDIT.
+# CMake toolchain file for Buildroot
+#
+
 string(REPLACE /usr/share/buildroot "" _HOST_DIR $${CMAKE_CURRENT_LIST_DIR})
+
 set(CMAKE_SYSTEM_NAME Linux)
 set(CMAKE_C_FLAGS "$${CMAKE_C_FLAGS} $(TARGET_CFLAGS)" CACHE STRING "Buildroot CFLAGS" FORCE)
 set(CMAKE_CXX_FLAGS "$${CMAKE_CXX_FLAGS} $(TARGET_CXXFLAGS)" CACHE STRING "Buildroot CXXFLAGS" FORCE)
 set(CMAKE_INSTALL_SO_NO_EXE 0)
+

Hi Samuel,

Quoted 33 lines · Samuel Martin

Signed-off-by Samuel Martin <[email protected]>

---
changes v1 -> v2:
- new patch

---
 package/pkg-cmake.mk | 8 ++++++++
 1 file changed, 8 insertions(+)

package/pkg-cmake.mk +7 -0

index a032426..19f7843 100644
@@ -161,17 +161,25 @@ host-cmake-package = $(call inner-cmake-package,host-$(pkgname),$(call UPPERCASE
 ################################################################################
 
 define TOOLCHAINFILE_CMAKE
+#
+# Automatically generated file; DO NOT EDIT.
+# CMake toolchain file for Buildroot
+#
+
 string(REPLACE /usr/share/buildroot "" _HOST_DIR $${CMAKE_CURRENT_LIST_DIR})
+
 set(CMAKE_SYSTEM_NAME Linux)
 set(CMAKE_C_FLAGS "$${CMAKE_C_FLAGS} $(TARGET_CFLAGS)" CACHE STRING "Buildroot CFLAGS" FORCE)
 set(CMAKE_CXX_FLAGS "$${CMAKE_CXX_FLAGS} $(TARGET_CXXFLAGS)" CACHE STRING "Buildroot CXXFLAGS" FORCE)
 set(CMAKE_INSTALL_SO_NO_EXE 0)
+
 set(CMAKE_PROGRAM_PATH $${_HOST_DIR}/usr/bin)
 set(CMAKE_FIND_ROOT_PATH $${_HOST_DIR}/$(STAGING_SUBDIR))
 set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
 set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)

package/pkg-cmake.mk host-cmake-package = $(call inner-cmake-package,host-$(pkgname),$(call UPPERCASE · line 185

Quoted 6 lines

package/pkg-cmake.mk +1 -0

 set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
 set(ENV{PKG_CONFIG_SYSROOT_DIR} $${_HOST_DIR}/$(STAGING_SUBDIR))
+
 # This toolchain file can be used both inside and outside Buildroot.
 # * When used inside Buildroot, ccache support is explicitly driven using the
 #   USE_CCACHE variable.

Shouldn't this be squashed into patch #3?

Set binutils programs CMake variables in the toolchainfile.cmake file.

This variables must be cached, otherwise they are wrongly set, resulting empty, which will make the builds fail.

Signed-off-by Samuel Martin <[email protected]>

---
changes v1 -> v2:
- new patch

---
 package/pkg-cmake.mk | 8 ++++++++
 1 file changed, 8 insertions(+)

package/pkg-cmake.mk +8 -0

index 19f7843..d6dadbe 100644
@@ -211,6 +211,14 @@ else()
 		set(CMAKE_CXX_COMPILER $(subst $(HOST_DIR),$${_HOST_DIR},$(TARGET_CROSS))g++)
 	endif()
 endif()
+
+set(CMAKE_LINKER  $(subst $(HOST_DIR),$${_HOST_DIR},$(TARGET_CROSS))ld      CACHE FILEPATH \"\" FORCE)
+set(CMAKE_AR      $(subst $(HOST_DIR),$${_HOST_DIR},$(TARGET_CROSS))ar      CACHE FILEPATH \"\" FORCE)
+set(CMAKE_RANLIB  $(subst $(HOST_DIR),$${_HOST_DIR},$(TARGET_CROSS))ranlib  CACHE FILEPATH \"\" FORCE)
+set(CMAKE_NM      $(subst $(HOST_DIR),$${_HOST_DIR},$(TARGET_CROSS))nm      CACHE FILEPATH \"\" FORCE)
+set(CMAKE_OBJCOPY $(subst $(HOST_DIR),$${_HOST_DIR},$(TARGET_CROSS))objcopy CACHE FILEPATH \"\" FORCE)
+set(CMAKE_OBJDUMP $(subst $(HOST_DIR),$${_HOST_DIR},$(TARGET_CROSS))objdump CACHE FILEPATH \"\" FORCE)
+set(CMAKE_STRIP   $(subst $(HOST_DIR),$${_HOST_DIR},$(TARGET_CROSS))strip   CACHE FILEPATH \"\" FORCE)
 endef
 
 $(HOST_DIR)/usr/share/buildroot/toolchainfile.cmake:

Quoted 4 lines · Samuel Martin

Set binutils programs CMake variables in the toolchainfile.cmake file.

This variables must be cached, otherwise they are wrongly set, resulting empty, which will make the builds fail.

Can you point to a specific build failure?

This CMake flag is used to enable tests. It may not disable the test programs from being built, but it controls the test execution.

Since we don't care about building the tests (and usually disable them when possible), make sure Buildroot won't try to run them.

Signed-off-by Samuel Martin <[email protected]>

---
changes v1 -> v2:
- new patch

---
 package/pkg-cmake.mk | 1 +
 1 file changed, 1 insertion(+)

package/pkg-cmake.mk +0 -0

index d6dadbe..e0efccb 100644

package/pkg-cmake.mk +0 -0

 		-DUSE_CCACHE=$(if $(BR2_CCACHE),ON,OFF) \
 		$$($$(PKG)_CONF_OPT) \

Quoted 15 lines · Samuel Martin

This CMake flag is used to enable tests. It may not disable the test programs from being built, but it controls the test execution.

Since we don't care about building the tests (and usually disable them when possible), make sure Buildroot won't try to run them.

Signed-off-by Samuel Martin <[email protected]>

---
changes v1 -> v2:
- new patch

---
 package/pkg-cmake.mk | 1 +
 1 file changed, 1 insertion(+)

package/pkg-cmake.mk define $(2)_CONFIGURE_CMDS · line 68

Quoted 9 lines

package/pkg-cmake.mk +1 -0

index d6dadbe..e0efccb 100644
@@ -65,6 +65,7 @@ define $(2)_CONFIGURE_CMDS
              -DCMAKE_TOOLCHAIN_FILE="$$(HOST_DIR)/usr/share/buildroot/toolchainfile.cmake" \
              -DCMAKE_INSTALL_PREFIX="/usr" \
              -DCMAKE_COLOR_MAKEFILE=OFF \
+             -DBUILD_TESTING=OFF \

Shouldn't this be done for the host variant as well?

package/pkg-cmake.mk define $(2)_CONFIGURE_CMDS · line 69

Quoted 2 lines

package/pkg-cmake.mk +0 -0

              -DBUILD_SHARED_LIBS=$(if $(BR2_PREFER_STATIC_LIB),OFF,ON) \

Not really related to this patch, but is there a specific reason why
some options are set in the toolchainfile.cmake and some are set on the command line?

This CMake flag is usually used to adjust compiler flags (like: -Ox, -g, etc).

So, it makes sense for Buildroot to globally drive this CMake flags in the cmake-package infrastructure.

However, if a package prefer overriding this default setting, it still can via the <PKG>_CONF_OPT variable.

Signed-off-by Samuel Martin <[email protected]>

---
changes v1 -> v2:
- new patch

---
 package/pkg-cmake.mk | 1 +
 1 file changed, 1 insertion(+)

package/pkg-cmake.mk +1 -0

index e0efccb..1c52a53 100644
@@ -63,6 +63,7 @@ define $(2)_CONFIGURE_CMDS
 	PATH=$(BR_PATH) \
 	$$($$(PKG)_CONF_ENV) $(HOST_DIR)/usr/bin/cmake $$($$(PKG)_SRCDIR) \
 		-DCMAKE_TOOLCHAIN_FILE="$$(HOST_DIR)/usr/share/buildroot/toolchainfile.cmake" \
+		-DCMAKE_BUILD_TYPE=$(if $(BR2_ENABLE_DEBUG),Debug,Release) \
 		-DCMAKE_INSTALL_PREFIX="/usr" \
 		-DCMAKE_COLOR_MAKEFILE=OFF \
 		-DBUILD_TESTING=OFF \

Quoted 10 lines · Samuel Martin

This CMake flag is usually used to adjust compiler flags (like: -Ox, -g, etc).

So, it makes sense for Buildroot to globally drive this CMake flags in the cmake-package infrastructure.

However, if a package prefer overriding this default setting, it still can via the <PKG>_CONF_OPT variable.

Signed-off-by Samuel Martin <[email protected]>

Reviewed-by Arnout Vandecappelle (Essensium/Mind) <[email protected]>

Regards,
Arnout

Quoted 14 lines

---
changes v1 -> v2:
- new patch

---
 package/pkg-cmake.mk | 1 +
 1 file changed, 1 insertion(+)

package/pkg-cmake.mk +0 -0

index e0efccb..1c52a53 100644

package/pkg-cmake.mk define $(2)_CONFIGURE_CMDS · line 69

Quoted 7 lines

package/pkg-cmake.mk +1 -0

@@ -63,6 +63,7 @@ define $(2)_CONFIGURE_CMDS
      PATH=$(BR_PATH) \
      $$($$(PKG)_CONF_ENV) $(HOST_DIR)/usr/bin/cmake $$($$(PKG)_SRCDIR) \
              -DCMAKE_TOOLCHAIN_FILE="$$(HOST_DIR)/usr/share/buildroot/toolchainfile.cmake" \
+             -DCMAKE_BUILD_TYPE=$(if $(BR2_ENABLE_DEBUG),Debug,Release) \
              -DCMAKE_INSTALL_PREFIX="/usr" \
              -DCMAKE_COLOR_MAKEFILE=OFF \
              -DBUILD_TESTING=OFF \

--

Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot