From: Woochan Lee <wc0917.lee@samsung.com>
Date: Fri, 24 Jun 2016 07:25:00 +0000 (+0900)
Subject: Including CAPI header by default.
X-Git-Tag: submit/tizen/20160630.072558~5
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F28%2F76528%2F1;p=platform%2Fcore%2Fuifw%2Fui-viewmgr.git

Including CAPI header by default.

Change-Id: I0e91cba0ce186ff52d45d4ef5997c1b57d42302e
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6977f3d..a97892b 100644
--- 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 7824ef4..961bc6a 100644
--- 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 73dbec4..ebfa3a1 100644
--- 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 8c9360d..31ca9ae 100644
--- 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()