add 3.0 build flag

Change-Id: I94659f25f8f37d3672ab377696256877a7297ddf
Signed-off-by: jkjo <jkjo92@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c1e70b2..fe74a14 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 PROJECT(oauth2 C)
 
 SET(PREFIX ${CMAKE_INSTALL_PREFIX})
-SET(EXEC_PREFIX "\${prefix}")
+##SET(EXEC_PREFIX "\${prefix}")
 #SET(LIBDIR "\${prefix}/lib")
 #SET(INCLUDEDIR "\${prefix}/include ")
 SET(VERSION_MAJOR 0)

diff --git a/packaging/oauth2.spec b/packaging/oauth2.spec
index fddca0f..a9d6cdb 100644 (file)
--- a/packaging/oauth2.spec
+++ b/packaging/oauth2.spec
@@ -12,8 +12,12 @@ BuildRequires:  pkgconfig(bundle)
 BuildRequires:  pkgconfig(capi-base-common)
 BuildRequires:  pkgconfig(libcurl)
 BuildRequires:  pkgconfig(efl-extension)
-#BuildRequires:  pkgconfig(ewebkit2)
-BuildRequires:  pkgconfig(chromium-efl)
+%if "%{?tizen_version}" == "3.0"
+BuildRequires: pkgconfig(chromium-efl)
+%else
+BuildRequires: pkgconfig(ewebkit2)
+%endif
+
 BuildRequires:  pkgconfig(json-glib-1.0)
 BuildRequires:  pkgconfig(elementary)
 
@@ -42,28 +46,38 @@ export FFLAGS="$FFLAGS -DTIZEN_DEBUG_ENABLE"
 
 export CFLAGS="${CFLAGS} -fPIC -fvisibility=hidden"
 
+%if "%{?tizen_version}" == "3.0"
+_CHROMIUM_EFL="YES"
+%else
+_CHROMIUM_EFL="NO"
+%endif
+
 %if "%{?tizen_profile_name}" == "wearable"
 cmake . \
--DCMAKE_INSTALL_PREFIX=/usr \
--DINCLUDEDIR=%{_includedir} \
+-DCMAKE_INSTALL_PREFIX=%{_prefix} \
 -DLIBDIR=%{_libdir} \
--DEXCLUDE_EWK_ERR="YES"
+-DINCLUDEDIR=%{_includedir} \
+-DEXCLUDE_EWK_ERR="YES" \
+-DUSE_CHROMIUM_EFL:BOOL=${_CHROMIUM_EFL}
 
 %else
 cmake . \
--DCMAKE_INSTALL_PREFIX=/usr \
--DINCLUDEDIR=%{_includedir} \
+-DCMAKE_INSTALL_PREFIX=%{_prefix} \
 -DLIBDIR=%{_libdir} \
-
+-DINCLUDEDIR=%{_includedir} \
+-DUSE_CHROMIUM_EFL:BOOL=${_CHROMIUM_EFL}
 %endif
 
+
 make %{?jobs:-j%jobs}
 
 %install
 rm -rf %{buildroot}
 %make_install
 
-rm -rf %{buildroot}/usr/lib/oauth2
+mkdir -p %{buildroot}%{_libdir}
+
+rm -rf %{buildroot}%{_libdir}/oauth2
 
 %postun -p /sbin/ldconfig
 

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 05a36d4..c71f27b 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -17,12 +17,18 @@ SET(SRCS
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src)
 
+INCLUDE(FindPkgConfig)
 if(DEFINED EXCLUDE_EWK_ERR)
     add_definitions(-DWITHOUT_EWK_ERROR)
 endif()
 
-INCLUDE(FindPkgConfig)
-pkg_check_modules(clientpkgs REQUIRED dlog capi-base-common libcurl efl-extension ecore evas chromium-efl json-glib-1.0 elementary)
+if(DEFINED USE_CHROMIUM_EFL)
+       add_definitions(-DWITH_CHROMIUM)
+       pkg_check_modules(clientpkgs REQUIRED dlog glib-2.0 gio-2.0 gio-unix-2.0 capi-base-common libcurl efl-extension ecore evas chromium-efl json-glib-1.0 elementary)
+else()
+       pkg_check_modules(clientpkgs REQUIRED dlog glib-2.0 gio-2.0 gio-unix-2.0 capi-base-common libcurl efl-extension ecore evas ewebkit2 json-glib-1.0 elementary)
+endif()
+
 FOREACH(flag ${clientpkgs_CFLAGS})
        SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
 ENDFOREACH(flag)
@@ -41,11 +47,15 @@ SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES VERSION ${VERSION})
 
 TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${clientpkgs_LDFLAGS})
 
+CONFIGURE_FILE(${PROJECT_NAME}.pc.in ${CMAKE_BINARY_DIR}/${PROJECT_NAME}.pc @ONLY)
+
 #INSTALL(TARGETS ${PROJECT_NAME} DESTINATION lib)
-INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIBDIR})
-CONFIGURE_FILE(oauth2.pc.in ../oauth2.pc @ONLY)
+#CONFIGURE_FILE(oauth2.pc.in ../oauth2.pc @ONLY)
 #INSTALL(FILES ${CMAKE_BINARY_DIR}/oauth2.pc DESTINATION lib/pkgconfig)
-INSTALL(FILES ${CMAKE_BINARY_DIR}/oauth2.pc DESTINATION ${LIBDIR}/pkgconfig)
+
+INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIBDIR}/oauth2)
+INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIBDIR})
+INSTALL(FILES ${CMAKE_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION ${LIBDIR}/pkgconfig)
 
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/include/oauth2.h DESTINATION include)
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/include/oauth2_manager.h DESTINATION include)

diff --git a/src/oauth2_private.h b/src/oauth2_private.h
index 95d3ce1..ce51c23 100644 (file)
--- a/src/oauth2_private.h
+++ b/src/oauth2_private.h
@@ -22,8 +22,12 @@
 #include <bundle.h>
 #include <curl/curl.h>
 
-//#include <EWebKit.h>
+#ifdef WITH_CHROMIUM           
+#include <ewk_chromium.h>              
+#else          
+#include <EWebKit.h>
 #include <ewk_view.h>
+#endif
 
 #include <json-glib/json-glib.h>
 #include "oauth2_manager.h"