Lubuntu/cmake
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Correctly pass CXXFLAGS with CPPFLAGS to bootstrap.

Browse Source
This commit is contained in:
Felix Geyer 2014-08-03 10:19:48 +02:00
parent c551cd3b80
commit bf9c0c2a76
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/changelog vendored
View File

@ -1,6 +1,7 @@
cmake (2.8.12.1-2) UNRELEASED; urgency=medium
* Add Lisandro and myself to uploaders.
* Correctly pass CXXFLAGS with CPPFLAGS to bootstrap.
-- Felix Geyer <fgeyer@debian.org> Sun, 03 Aug 2014 10:02:57 +0200

4
debian/rules vendored
View File

@ -1,6 +1,6 @@
#!/usr/bin/make -f
export DEB_CPPFLAGS_MAINT_APPEND := $(shell dpkg-buildflags --get CPPFLAGS)
export DEB_CXXFLAGS_MAINT_APPEND := $(shell dpkg-buildflags --get CPPFLAGS)
export DEB_CFLAGS_MAINT_APPEND := $(shell dpkg-buildflags --get CPPFLAGS)
ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
@ -22,7 +22,7 @@ $(BUILD_FLAGS_FILE) verify-build-flags:
$(call $(flag_action),CMAKE_USE_RELATIVE_PATHS,ON,"Use relative paths")
$(call $(flag_action),CMAKE_VERBOSE_MAKEFILE,ON,"Verbose build")
$(call $(flag_action),CMAKE_C_FLAGS,"$(CFLAGS)","C flags")
$(call $(flag_action),CMAKE_CXX_FLAGS,"$(CFLAGS)","C++ flags")
$(call $(flag_action),CMAKE_CXX_FLAGS,"$(CXXFLAGS)","C++ flags")
$(call $(flag_action),CMAKE_SKIP_BOOTSTRAP_TEST,ON,"Skip BootstrapTest")
$(call $(flag_action),BUILD_CursesDialog,ON,"Build curses GUI")
$(call $(flag_action),BUILD_QtDialog,ON,"Build Qt4 GUI")