cedric pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=0a6a3deaee0f5d857fff133c77e5989dba2d4e57
commit 0a6a3deaee0f5d857fff133c77e5989dba2d4e57 Author: Felipe Magno de Almeida <[email protected]> Date: Fri May 9 12:43:38 2014 +0200 eolian_cxx: removes C++ examples when C++11 isn't supported Summary: Added HAVE_CXX11 guards to Makefile*.am files for C++ binding to avoid compilation errors for examples when C++11 isn't supported. This also disable installation of all EFL CXX pkgconfig files. Reviewers: cedric, stefan, stefan_schmidt CC: cedric, savio Differential Revision: https://phab.enlightenment.org/D831 Signed-off-by: Cedric Bail <[email protected]> --- Makefile.am | 20 ++++++++++++-------- src/Makefile.am | 10 ++++++++-- src/examples/evas/Makefile.am | 4 ++++ 3 files changed, 24 insertions(+), 10 deletions(-) diff --git a/Makefile.am b/Makefile.am index d18778d..e8cd552 100644 --- a/Makefile.am +++ b/Makefile.am @@ -120,16 +120,11 @@ endif pkgconfig_DATA += \ pc/eina.pc \ -pc/eina-cxx.pc \ pc/eo.pc \ -pc/eo-cxx.pc \ pc/eolian.pc \ -pc/eolian-cxx.pc \ pc/eet.pc \ -pc/eet-cxx.pc \ pc/evas.pc \ pc/ecore.pc \ -pc/ecore-cxx.pc \ pc/ecore-con.pc \ pc/ecore-ipc.pc \ pc/ecore-file.pc \ @@ -146,11 +141,20 @@ pc/efreet.pc \ pc/efreet-mime.pc \ pc/efreet-trash.pc \ pc/edje.pc \ -pc/edje-cxx.pc \ pc/emotion.pc \ pc/ethumb.pc \ -pc/ethumb_client.pc \ -pc/evas-cxx.pc +pc/ethumb_client.pc + +if HAVE_CXX11 +pkgconfig_DATA += \ +pc/eina-cxx.pc \ +pc/evas-cxx.pc \ +pc/ecore-cxx.pc \ +pc/eolian-cxx.pc \ +pc/edje-cxx.pc \ +pc/eet-cxx.pc \ +pc/eo-cxx.pc +endif if BUILD_ENGINE_SOFTWARE_X11 pkgconfig_DATA += pc/evas-software-x11.pc diff --git a/src/Makefile.am b/src/Makefile.am index a4d0a69..41fc0d3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -91,7 +91,6 @@ benchmark: all-am EXAMPLES_SUBDIRS = \ examples/eina \ -examples/eina_cxx \ examples/eo \ examples/eet \ examples/evas \ @@ -102,11 +101,18 @@ examples/eldbus \ examples/ephysics \ examples/edje \ examples/emotion \ -examples/ethumb_client \ +examples/ethumb_client + +if HAVE_CXX11 +EXAMPLES_SUBDIRS += \ +examples/eina_cxx \ examples/eolian_cxx +endif + if ALWAYS_BUILD_EXAMPLES SUBDIRS += . $(EXAMPLES_SUBDIRS) endif + DIST_SUBDIRS += $(EXAMPLES_SUBDIRS) examples: all-am diff --git a/src/examples/evas/Makefile.am b/src/examples/evas/Makefile.am index 4cd212d..e53e24d 100644 --- a/src/examples/evas/Makefile.am +++ b/src/examples/evas/Makefile.am @@ -206,6 +206,8 @@ evas_aspect_hints_SOURCES = evas-aspect-hints.c evas_aspect_hints_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS) evas_aspect_hints_LDADD = $(EDJE_COMMON_LDADD) +if HAVE_CXX11 + EXTRA_PROGRAMS += evas_cxx_rectangle evas_cxx_rectangle_SOURCES = evas_cxx_rectangle.cc evas_cxx_rectangle_LDADD = $(ECORE_EVAS_COMMON_LDADD) @@ -218,6 +220,8 @@ evas_cxx_rectangle_CPPFLAGS = $(ECORE_EVAS_COMMON_CPPFLAGS) \ -I$(top_builddir)/src/bindings/evas_cxx \ $(AM_CPPFLAGS) @EVAS_CFLAGS@ +endif + EDJS = $(EDCS:%.edc=%.edj) SRCS = \ --
