| Message ID | 20161016111245.1847-3-s.martin49@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
On 16-10-16 13:12, Samuel Martin wrote: > The chosen CMAKE_BUILD_TYPE encodes an option of the Buildroot > configuration, so it makes more sense to save it in the > toolchainfile.cmake than to pass it during configure. > > It is still possible to override the build type on the cmake > command line. > > Cc: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> > Cc: Maxime Hadjinlian <maxime.hadjinlian@gmail.com> > Signed-off-by: Samuel Martin <s.martin49@gmail.com> Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> except for a small typo in the CHANGES file... > > --- > changes v5->v6: > - reword commit log (Arnout) > - simplify/remove intermediate variable (Arnout) > > changes v4->v5: > - fix cmake set call > > changes v3->v4: > - new patch > --- > CHANGES | 6 ++++++ > package/pkg-cmake.mk | 2 +- > support/misc/toolchainfile.cmake.in | 3 +++ > 3 files changed, 10 insertions(+), 1 deletion(-) > > diff --git a/CHANGES b/CHANGES > index b4bd5fe..c0e3e79 100644 > --- a/CHANGES > +++ b/CHANGES > @@ -1,3 +1,9 @@ > +2016.11-rc1, > + > + toolchainfile.cmake: > + * when used outside of Buildroot, if not specified on the command > + line, the CMAKE_BUILD_TYPE is by toolchainfile.cmake. ^^set Actually the "when used outside of Buildroot" part is redundant because it is still true when used inside Buildroot :-) Regards, Arnout > + > 2016.08, Released September 1st, 2016 > > Minor fixes. > diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk > index 4883b3b..4e0e838 100644 > --- a/package/pkg-cmake.mk > +++ b/package/pkg-cmake.mk > @@ -87,7 +87,6 @@ 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_BUILD_TYPE=$$(if $$(BR2_ENABLE_DEBUG),Debug,Release) \ > -DCMAKE_INSTALL_PREFIX="/usr" \ > -DCMAKE_COLOR_MAKEFILE=OFF \ > -DBUILD_DOC=OFF \ > @@ -247,5 +246,6 @@ $(HOST_DIR)/usr/share/buildroot/toolchainfile.cmake: > -e 's#@@TARGET_FC@@#$(subst $(HOST_DIR)/,,$(call qstrip,$(TARGET_FC)))#' \ > -e 's#@@CMAKE_SYSTEM_PROCESSOR@@#$(call qstrip,$(CMAKE_SYSTEM_PROCESSOR))#' \ > -e 's#@@TOOLCHAIN_HAS_FORTRAN@@#$(if $(BR2_TOOLCHAIN_HAS_FORTRAN),1,0)#' \ > + -e 's#@@CMAKE_BUILD_TYPE@@#$(if $(BR2_ENABLE_DEBUG),Debug,Release)#' \ > $(TOPDIR)/support/misc/toolchainfile.cmake.in \ > > $@ > diff --git a/support/misc/toolchainfile.cmake.in b/support/misc/toolchainfile.cmake.in > index 649b52d..1c5031f 100644 > --- a/support/misc/toolchainfile.cmake.in > +++ b/support/misc/toolchainfile.cmake.in > @@ -13,6 +13,9 @@ string(REPLACE "/usr/share/buildroot" "" RELOCATED_HOST_DIR ${CMAKE_CURRENT_LIST > set(CMAKE_SYSTEM_NAME Linux) > set(CMAKE_SYSTEM_PROCESSOR @@CMAKE_SYSTEM_PROCESSOR@@) > > +# Build type from the Buildroot configuration > +set(CMAKE_BUILD_TYPE @@CMAKE_BUILD_TYPE@@ CACHE STRING "Buildroot build configuration") > + > set(CMAKE_C_FLAGS "@@TARGET_CFLAGS@@ ${CMAKE_C_FLAGS}" CACHE STRING "Buildroot CFLAGS") > set(CMAKE_CXX_FLAGS "@@TARGET_CXXFLAGS@@ ${CMAKE_CXX_FLAGS}" CACHE STRING "Buildroot CXXFLAGS") > set(CMAKE_EXE_LINKER_FLAGS "@@TARGET_LDFLAGS@@ ${CMAKE_EXE_LINKER_FLAGS}" CACHE STRING "Buildroot LDFLAGS") >
Hello, On Sun, 16 Oct 2016 13:12:38 +0200, Samuel Martin wrote: > + toolchainfile.cmake: > + * when used outside of Buildroot, if not specified on the command > + line, the CMAKE_BUILD_TYPE is by toolchainfile.cmake. I've reworded this differently. Please double check that the new text is fine. Thanks, Thomas
diff --git a/CHANGES b/CHANGES index b4bd5fe..c0e3e79 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,9 @@ +2016.11-rc1, + + toolchainfile.cmake: + * when used outside of Buildroot, if not specified on the command + line, the CMAKE_BUILD_TYPE is by toolchainfile.cmake. + 2016.08, Released September 1st, 2016 Minor fixes. diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk index 4883b3b..4e0e838 100644 --- a/package/pkg-cmake.mk +++ b/package/pkg-cmake.mk @@ -87,7 +87,6 @@ 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_BUILD_TYPE=$$(if $$(BR2_ENABLE_DEBUG),Debug,Release) \ -DCMAKE_INSTALL_PREFIX="/usr" \ -DCMAKE_COLOR_MAKEFILE=OFF \ -DBUILD_DOC=OFF \ @@ -247,5 +246,6 @@ $(HOST_DIR)/usr/share/buildroot/toolchainfile.cmake: -e 's#@@TARGET_FC@@#$(subst $(HOST_DIR)/,,$(call qstrip,$(TARGET_FC)))#' \ -e 's#@@CMAKE_SYSTEM_PROCESSOR@@#$(call qstrip,$(CMAKE_SYSTEM_PROCESSOR))#' \ -e 's#@@TOOLCHAIN_HAS_FORTRAN@@#$(if $(BR2_TOOLCHAIN_HAS_FORTRAN),1,0)#' \ + -e 's#@@CMAKE_BUILD_TYPE@@#$(if $(BR2_ENABLE_DEBUG),Debug,Release)#' \ $(TOPDIR)/support/misc/toolchainfile.cmake.in \ > $@ diff --git a/support/misc/toolchainfile.cmake.in b/support/misc/toolchainfile.cmake.in index 649b52d..1c5031f 100644 --- a/support/misc/toolchainfile.cmake.in +++ b/support/misc/toolchainfile.cmake.in @@ -13,6 +13,9 @@ string(REPLACE "/usr/share/buildroot" "" RELOCATED_HOST_DIR ${CMAKE_CURRENT_LIST set(CMAKE_SYSTEM_NAME Linux) set(CMAKE_SYSTEM_PROCESSOR @@CMAKE_SYSTEM_PROCESSOR@@) +# Build type from the Buildroot configuration +set(CMAKE_BUILD_TYPE @@CMAKE_BUILD_TYPE@@ CACHE STRING "Buildroot build configuration") + set(CMAKE_C_FLAGS "@@TARGET_CFLAGS@@ ${CMAKE_C_FLAGS}" CACHE STRING "Buildroot CFLAGS") set(CMAKE_CXX_FLAGS "@@TARGET_CXXFLAGS@@ ${CMAKE_CXX_FLAGS}" CACHE STRING "Buildroot CXXFLAGS") set(CMAKE_EXE_LINKER_FLAGS "@@TARGET_LDFLAGS@@ ${CMAKE_EXE_LINKER_FLAGS}" CACHE STRING "Buildroot LDFLAGS")
The chosen CMAKE_BUILD_TYPE encodes an option of the Buildroot configuration, so it makes more sense to save it in the toolchainfile.cmake than to pass it during configure. It is still possible to override the build type on the cmake command line. Cc: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Cc: Maxime Hadjinlian <maxime.hadjinlian@gmail.com> Signed-off-by: Samuel Martin <s.martin49@gmail.com> --- changes v5->v6: - reword commit log (Arnout) - simplify/remove intermediate variable (Arnout) changes v4->v5: - fix cmake set call changes v3->v4: - new patch --- CHANGES | 6 ++++++ package/pkg-cmake.mk | 2 +- support/misc/toolchainfile.cmake.in | 3 +++ 3 files changed, 10 insertions(+), 1 deletion(-)