Add option to build with or without x

Theses changes are needed to manage X11 #ifdef in wrt-commons header file
https://review.tizen.org/gerrit/15793

Change-Id: I0d4ba71739fcaa1d62530d30046715a1eb6b2899
Signed-off-by: Baptiste DURAND <baptiste.durand@open.eurogiciel.org>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d88f711..2f0b87f 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -57,6 +57,10 @@ SET(CMAKE_CXX_FLAGS_CCOV       "-O0 -std=c++0x -g --coverage")
 
 OPTION(DPL_LOG "DPL logs status" ON)
 OPTION(WITH_TESTS "Build tests" OFF)
+OPTION(X11_SUPPORT "Enable X11" ON)
+IF(X11_SUPPORT)
+    ADD_DEFINITIONS("-DX11")
+ENDIF(X11_SUPPORT)
 
 IF(DPL_LOG AND NOT CMAKE_BUILD_TYPE MATCHES "profiling")
     MESSAGE(STATUS "Logging enabled for DPL")

diff --git a/packaging/wrt-plugins-common.spec b/packaging/wrt-plugins-common.spec
index 3e507cf..486f927 100644 (file)
--- a/packaging/wrt-plugins-common.spec
+++ b/packaging/wrt-plugins-common.spec
@@ -1,3 +1,4 @@
+%bcond_with x
 Name:       wrt-plugins-common
 Summary:    wrt-plugins common library
 Version:    0.3.115
@@ -54,6 +55,11 @@ export FFLAGS="$FFLAGS -DTIZEN_ENGINEER_MODE"
 %cmake . -DDPL_LOG="ON"                     \
         -DCMAKE_PROJECT_VERSION=%{version} \
         -DCMAKE_BUILD_TYPE=%{?build_type:%build_type} \
+%if %{with x}
+         -DX11_SUPPORT=On \
+%else
+         -DX11_SUPPORT=Off \
+%endif
            %{?WITH_TESTS:-DWITH_TESTS=%WITH_TESTS}
 make %{?jobs:-j%jobs}