Including CAPI header by default.

Change-Id: I0e91cba0ce186ff52d45d4ef5997c1b57d42302e

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6977f3d030fd61d2e46c2d0fe72fa07ced06c58d..a97892b84a4b3b23aeaee933befd16aa23a42895 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,8 +27,8 @@ ADD_DEFINITIONS("-DVERSION=\"${VERSION}\"")
 ADD_DEFINITIONS("-DBINNAME=\"${BINNAME}\"")
 ADD_DEFINITIONS("-DLOCALE_DIR=\"${LOCALEDIR}\"")
 
-IF("${TARGET_LANGUAGE}" STREQUAL "c")
-       ADD_DEFINITIONS(-DTARGET_LANG_C)
+IF("${TARGET_LANGUAGE}" STREQUAL "c++")
+       ADD_DEFINITIONS(-DTARGET_LANG_CPLUS)
 ENDIF()
 
 INCLUDE(FindPkgConfig)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7824ef42d590e7d371b3829f1cf36a9b2a911249..961bc6a6f5147001daac0a9e1e2f4549f973e048 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -4,8 +4,8 @@ LINK_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/lib)
 ADD_SUBDIRECTORY(include)
 ADD_SUBDIRECTORY(lib)
 
-IF("${TARGET_LANGUAGE}" STREQUAL "c")
-       ADD_SUBDIRECTORY(examples/efl/c)
-ELSE()
+IF("${TARGET_LANGUAGE}" STREQUAL "c++")
        ADD_SUBDIRECTORY(examples/efl/cpp)
+ELSE()
+       ADD_SUBDIRECTORY(examples/efl/c)
 ENDIF()

diff --git a/src/include/ui_viewmanager.h b/src/include/ui_viewmanager.h
index 73dbec4bd2677903a373e998800cc80b5e773673..ebfa3a1ae442f47ccc2acd6dd8f24681d4572121 100644 (file)
--- a/src/include/ui_viewmanager.h
+++ b/src/include/ui_viewmanager.h
@@ -15,8 +15,8 @@
  *
  */
 
-#ifdef TARGET_LANG_C
-       #include "efl/mobile/c/ui_mobile_viewmanager.h"
-#else
+#ifdef TARGET_LANG_CPLUS
        #include "efl/mobile/ui_mobile_viewmanager.h"
+#else
+       #include "efl/mobile/c/ui_mobile_viewmanager.h"
 #endif

diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt
index 8c9360d302081032cdfd3fd4c779ecf8688885ed..31ca9ae0987d1e628f67ed6c041bee2f8b74595c 100644 (file)
--- a/src/lib/CMakeLists.txt
+++ b/src/lib/CMakeLists.txt
@@ -1,4 +1,4 @@
-IF("${TARGET_LANGUAGE}" STREQUAL "c")
+IF("${TARGET_LANGUAGE}" STREQUAL "c++")
 SET(SRCS
      interface/ui_iface_overlay.cpp
      interface/ui_iface_view.cpp
@@ -15,12 +15,6 @@ SET(SRCS
      efl/mobile/ui_standard_view.cpp
      efl/mobile/ui_key_listener.cpp
      efl/mobile/ui_viewmgr.cpp
-     efl/mobile/c/ui_application.cpp
-     efl/mobile/c/ui_menu.cpp
-     efl/mobile/c/ui_popup.cpp
-     efl/mobile/c/ui_view.cpp
-     efl/mobile/c/ui_standard_view.cpp
-     efl/mobile/c/ui_viewmgr.cpp
     )
 ELSE()
 SET(SRCS
@@ -39,6 +33,12 @@ SET(SRCS
      efl/mobile/ui_standard_view.cpp
      efl/mobile/ui_key_listener.cpp
      efl/mobile/ui_viewmgr.cpp
+     efl/mobile/c/ui_application.cpp
+     efl/mobile/c/ui_menu.cpp
+     efl/mobile/c/ui_popup.cpp
+     efl/mobile/c/ui_view.cpp
+     efl/mobile/c/ui_standard_view.cpp
+     efl/mobile/c/ui_viewmgr.cpp
     )
 ENDIF()