enlightenment/efl
enlightenment
/
efl
8
7
Fork 15
Code Issues 13 Pull Requests 2 Projects Releases Wiki Activity

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 <cedric.bail@free.fr>
This commit is contained in:
Felipe Magno de Almeida 2014-05-09 12:43:38 +02:00 committed by Cedric Bail
parent 78564fac45
commit 0a6a3deaee
3 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Makefile.am
View File

@ -120,16 +120,11 @@ endif
pkgconfig_DATA += \ pkgconfig_DATA += \
pc/eina.pc \ pc/eina.pc \
pc/eina-cxx.pc \
pc/eo.pc \ pc/eo.pc \
pc/eo-cxx.pc \
pc/eolian.pc \ pc/eolian.pc \
pc/eolian-cxx.pc \
pc/eet.pc \ pc/eet.pc \
pc/eet-cxx.pc \
pc/evas.pc \ pc/evas.pc \
pc/ecore.pc \ pc/ecore.pc \
pc/ecore-cxx.pc \
pc/ecore-con.pc \ pc/ecore-con.pc \
pc/ecore-ipc.pc \ pc/ecore-ipc.pc \
pc/ecore-file.pc \ pc/ecore-file.pc \
@ -146,11 +141,20 @@ pc/efreet.pc \
pc/efreet-mime.pc \ pc/efreet-mime.pc \
pc/efreet-trash.pc \ pc/efreet-trash.pc \
pc/edje.pc \ pc/edje.pc \
pc/edje-cxx.pc \
pc/emotion.pc \ pc/emotion.pc \
pc/ethumb.pc \ pc/ethumb.pc \
pc/ethumb_client.pc \ pc/ethumb_client.pc
pc/evas-cxx.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 if BUILD_ENGINE_SOFTWARE_X11
pkgconfig_DATA += pc/evas-software-x11.pc pkgconfig_DATA += pc/evas-software-x11.pc

10
src/Makefile.am
View File

@ -91,7 +91,6 @@ benchmark: all-am
EXAMPLES_SUBDIRS = \ EXAMPLES_SUBDIRS = \
examples/eina \ examples/eina \
examples/eina_cxx \
examples/eo \ examples/eo \
examples/eet \ examples/eet \
examples/evas \ examples/evas \
@ -102,11 +101,18 @@ examples/eldbus \
examples/ephysics \ examples/ephysics \
examples/edje \ examples/edje \
examples/emotion \ examples/emotion \
examples/ethumb_client \ examples/ethumb_client
if HAVE_CXX11
EXAMPLES_SUBDIRS += \
examples/eina_cxx \
examples/eolian_cxx examples/eolian_cxx
endif
if ALWAYS_BUILD_EXAMPLES if ALWAYS_BUILD_EXAMPLES
SUBDIRS += . $(EXAMPLES_SUBDIRS) SUBDIRS += . $(EXAMPLES_SUBDIRS)
endif endif
DIST_SUBDIRS += $(EXAMPLES_SUBDIRS) DIST_SUBDIRS += $(EXAMPLES_SUBDIRS)
examples: all-am examples: all-am

4
src/examples/evas/Makefile.am
View File

@ -206,6 +206,8 @@ evas_aspect_hints_SOURCES = evas-aspect-hints.c
evas_aspect_hints_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS) evas_aspect_hints_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS)
evas_aspect_hints_LDADD = $(EDJE_COMMON_LDADD) evas_aspect_hints_LDADD = $(EDJE_COMMON_LDADD)
if HAVE_CXX11
EXTRA_PROGRAMS += evas_cxx_rectangle EXTRA_PROGRAMS += evas_cxx_rectangle
evas_cxx_rectangle_SOURCES = evas_cxx_rectangle.cc evas_cxx_rectangle_SOURCES = evas_cxx_rectangle.cc
evas_cxx_rectangle_LDADD = $(ECORE_EVAS_COMMON_LDADD) 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 \ -I$(top_builddir)/src/bindings/evas_cxx \
$(AM_CPPFLAGS) @EVAS_CFLAGS@ $(AM_CPPFLAGS) @EVAS_CFLAGS@
endif
EDJS = $(EDCS:%.edc=%.edj) EDJS = $(EDCS:%.edc=%.edj)
SRCS = \ SRCS = \