summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Edmundson <davidedmundson@kde.org>2014-06-14 15:51:23 (GMT)
committerDavid Edmundson <davidedmundson@kde.org>2014-06-14 15:51:23 (GMT)
commit1916533698d0212bad4e0af5168db4992ceef99d (patch)
treedd818c25ef8a738ddb2e9902ac18c985aff99b43
parentc82352e31f31bf433b120f1bcc73927661a1fdd4 (diff)
downloadtelepathy-qt4-1916533698d0212bad4e0af5168db4992ceef99d.tar.gz
telepathy-qt4-1916533698d0212bad4e0af5168db4992ceef99d.tar.xz
Enable services by default
-rw-r--r--CMakeLists.txt6
-rw-r--r--TelepathyQt/CMakeLists.txt4
-rw-r--r--examples/cm/CMakeLists.txt4
-rw-r--r--tests/dbus/CMakeLists.txt4
4 files changed, 9 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 78deb2d..f112892 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -112,7 +112,7 @@ else (${TP_QT_NANO_VERSION} EQUAL 0)
endif (${TP_QT_NANO_VERSION} EQUAL 0)
# Add an option for compiling tp-qt-service
-option(ENABLE_EXPERIMENTAL_SERVICE_SUPPORT "Enable compilation of experimental and unstable service side bindings for Telepathy-Qt" FALSE)
+option(ENABLE_SERVICE_SUPPORT "Enable compilation of service side bindings for Telepathy-Qt" TRUE)
# Add an option for compiling examples
option(ENABLE_EXAMPLES "Enable compilation of examples for Telepathy-Qt" TRUE)
# Add an option for compiling Farstream
@@ -120,9 +120,9 @@ option(ENABLE_FARSTREAM "Enable compilation of Farstream bindings" TRUE)
# Add an option for building tests
option(ENABLE_TESTS "Enable compilation of automated tests" TRUE)
-if (ENABLE_EXPERIMENTAL_SERVICE_SUPPORT)
+if (ENABLE_SERVICE_SUPPORT)
message(STATUS "You have enabled experimental service support for Telepathy-Qt. Be aware there are no guarantees of API stability yet for service-side classes.")
-endif (ENABLE_EXPERIMENTAL_SERVICE_SUPPORT)
+endif (ENABLE_SERVICE_SUPPORT)
# The doxygen macro requires Qt to have been looked up to enable crosslinking
include(Doxygen)
diff --git a/TelepathyQt/CMakeLists.txt b/TelepathyQt/CMakeLists.txt
index dad92cf..8e41f86 100644
--- a/TelepathyQt/CMakeLists.txt
+++ b/TelepathyQt/CMakeLists.txt
@@ -850,7 +850,7 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/TelepathyQt${QT_VERSION_MAJOR}ConfigVe
add_subdirectory(Farstream)
-if(ENABLE_EXPERIMENTAL_SERVICE_SUPPORT)
+if(ENABLE_SERVICE_SUPPORT)
# lets build tp-qt service side support as a separate library until we can guarantee API/ABI
# stability
set(telepathy_qt_service_SRCS
@@ -1010,4 +1010,4 @@ if(ENABLE_EXPERIMENTAL_SERVICE_SUPPORT)
DESTINATION ${_TelepathyQtServiceConfig_INSTALL_DIR}
COMPONENT headers)
-endif(ENABLE_EXPERIMENTAL_SERVICE_SUPPORT)
+endif(ENABLE_SERVICE_SUPPORT)
diff --git a/examples/cm/CMakeLists.txt b/examples/cm/CMakeLists.txt
index c82fff5..dbc4ca8 100644
--- a/examples/cm/CMakeLists.txt
+++ b/examples/cm/CMakeLists.txt
@@ -1,4 +1,4 @@
-if(ENABLE_EXPERIMENTAL_SERVICE_SUPPORT)
+if(ENABLE_SERVICE_SUPPORT)
set(cm_SRCS
protocol.h
protocol.cpp
@@ -18,4 +18,4 @@ if(ENABLE_EXPERIMENTAL_SERVICE_SUPPORT)
telepathy-qt${QT_VERSION_MAJOR}
telepathy-qt${QT_VERSION_MAJOR}-service
${TP_QT_EXECUTABLE_LINKER_FLAGS})
-endif(ENABLE_EXPERIMENTAL_SERVICE_SUPPORT)
+endif(ENABLE_SERVICE_SUPPORT)
diff --git a/tests/dbus/CMakeLists.txt b/tests/dbus/CMakeLists.txt
index fe8c7e0..21efe53 100644
--- a/tests/dbus/CMakeLists.txt
+++ b/tests/dbus/CMakeLists.txt
@@ -90,10 +90,10 @@ tpqt_add_dbus_unit_test(CmProtocol cm-protocol)
tpqt_add_dbus_unit_test(ProfileManager profile-manager)
tpqt_add_dbus_unit_test(Types types)
-if(ENABLE_EXPERIMENTAL_SERVICE_SUPPORT)
+if(ENABLE_SERVICE_SUPPORT)
tpqt_add_dbus_unit_test(BaseConnectionManager base-cm telepathy-qt${QT_VERSION_MAJOR}-service)
tpqt_add_dbus_unit_test(BaseProtocol base-protocol telepathy-qt${QT_VERSION_MAJOR}-service)
-endif(ENABLE_EXPERIMENTAL_SERVICE_SUPPORT)
+endif(ENABLE_SERVICE_SUPPORT)
# Make check target. In case of check, output on failure and put it into a log
# This target has to stay here for catching all of the tests