You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@celix.apache.org by ab...@apache.org on 2015/01/12 16:31:03 UTC
svn commit: r1651122 - in /celix/trunk: dependency_manager_2/
remote_services/discovery_bonjour/ remote_services/discovery_etcd/
remote_services/discovery_shm/ remote_services/discovery_slp/
remote_services/remote_service_admin_shm/ utils/
Author: abroekhuis
Date: Mon Jan 12 15:31:02 2015
New Revision: 1651122
URL: http://svn.apache.org/r1651122
Log:
CELIX-202: Disabled components in the CMake config.
Modified:
celix/trunk/dependency_manager_2/CMakeLists.txt
celix/trunk/remote_services/discovery_bonjour/CMakeLists.txt
celix/trunk/remote_services/discovery_etcd/CMakeLists.txt
celix/trunk/remote_services/discovery_shm/CMakeLists.txt
celix/trunk/remote_services/discovery_slp/CMakeLists.txt
celix/trunk/remote_services/remote_service_admin_shm/CMakeLists.txt
celix/trunk/utils/CMakeLists.txt
Modified: celix/trunk/dependency_manager_2/CMakeLists.txt
URL: http://svn.apache.org/viewvc/celix/trunk/dependency_manager_2/CMakeLists.txt?rev=1651122&r1=1651121&r2=1651122&view=diff
==============================================================================
--- celix/trunk/dependency_manager_2/CMakeLists.txt (original)
+++ celix/trunk/dependency_manager_2/CMakeLists.txt Mon Jan 12 15:31:02 2015
@@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.
-celix_subproject(DEPENDENCY_MANAGER2 "Option to build the dependency manager static library" "ON" DEPS framework)
+celix_subproject(DEPENDENCY_MANAGER2 "Option to build the dependency manager static library" "OFF" DEPS framework)
if (DEPENDENCY_MANAGER2)
# Add -fPIC for x86_64 Unix platforms; this lib will be linked to a shared lib
if(UNIX AND NOT WIN32)
Modified: celix/trunk/remote_services/discovery_bonjour/CMakeLists.txt
URL: http://svn.apache.org/viewvc/celix/trunk/remote_services/discovery_bonjour/CMakeLists.txt?rev=1651122&r1=1651121&r2=1651122&view=diff
==============================================================================
--- celix/trunk/remote_services/discovery_bonjour/CMakeLists.txt (original)
+++ celix/trunk/remote_services/discovery_bonjour/CMakeLists.txt Mon Jan 12 15:31:02 2015
@@ -14,7 +14,7 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-celix_subproject(RSA_BUNDLES_DISCOVERY_BONJOUR "Option to enable building the Discovery BONJOUR bundle" ON DEPS LAUNCHER topology_manager remote_service_admin)
+celix_subproject(RSA_BUNDLES_DISCOVERY_BONJOUR "Option to enable building the Discovery BONJOUR bundle" OFF DEPS LAUNCHER topology_manager remote_service_admin)
if (RSA_BUNDLES_DISCOVERY_BONJOUR)
#TODO find_package(DNS-SD REQUIRED)
Modified: celix/trunk/remote_services/discovery_etcd/CMakeLists.txt
URL: http://svn.apache.org/viewvc/celix/trunk/remote_services/discovery_etcd/CMakeLists.txt?rev=1651122&r1=1651121&r2=1651122&view=diff
==============================================================================
--- celix/trunk/remote_services/discovery_etcd/CMakeLists.txt (original)
+++ celix/trunk/remote_services/discovery_etcd/CMakeLists.txt Mon Jan 12 15:31:02 2015
@@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.
-celix_subproject(RSA_BUNDLES_DISCOVERY_ETCD "Option to enable building the Discovery (ETCD) bundle" ON DEPS LAUNCHER topology_manager remote_service_admin)
+celix_subproject(RSA_BUNDLES_DISCOVERY_ETCD "Option to enable building the Discovery (ETCD) bundle" OFF DEPS LAUNCHER topology_manager remote_service_admin)
if (RSA_BUNDLES_DISCOVERY_ETCD)
find_package(CURL REQUIRED)
find_package(LibXml2 REQUIRED)
Modified: celix/trunk/remote_services/discovery_shm/CMakeLists.txt
URL: http://svn.apache.org/viewvc/celix/trunk/remote_services/discovery_shm/CMakeLists.txt?rev=1651122&r1=1651121&r2=1651122&view=diff
==============================================================================
--- celix/trunk/remote_services/discovery_shm/CMakeLists.txt (original)
+++ celix/trunk/remote_services/discovery_shm/CMakeLists.txt Mon Jan 12 15:31:02 2015
@@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.
-celix_subproject(RSA_BUNDLES_DISCOVERY_SHM "Option to enable building the Discovery (SHM) bundle" ON DEPS LAUNCHER topology_manager remote_service_admin)
+celix_subproject(RSA_BUNDLES_DISCOVERY_SHM "Option to enable building the Discovery (SHM) bundle" OFF DEPS LAUNCHER topology_manager remote_service_admin)
if (RSA_BUNDLES_DISCOVERY_SHM)
include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
include_directories("${PROJECT_SOURCE_DIR}/remote_services/utils/public/include")
Modified: celix/trunk/remote_services/discovery_slp/CMakeLists.txt
URL: http://svn.apache.org/viewvc/celix/trunk/remote_services/discovery_slp/CMakeLists.txt?rev=1651122&r1=1651121&r2=1651122&view=diff
==============================================================================
--- celix/trunk/remote_services/discovery_slp/CMakeLists.txt (original)
+++ celix/trunk/remote_services/discovery_slp/CMakeLists.txt Mon Jan 12 15:31:02 2015
@@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.
-celix_subproject(RSA_BUNDLES_DISCOVERY_SLP "Option to enable building the Discovery SLP bundle" ON DEPS LAUNCHER topology_manager remote_service_admin)
+celix_subproject(RSA_BUNDLES_DISCOVERY_SLP "Option to enable building the Discovery SLP bundle" OFF DEPS LAUNCHER topology_manager remote_service_admin)
if (RSA_BUNDLES_DISCOVERY_SLP)
find_package(Slp REQUIRED)
Modified: celix/trunk/remote_services/remote_service_admin_shm/CMakeLists.txt
URL: http://svn.apache.org/viewvc/celix/trunk/remote_services/remote_service_admin_shm/CMakeLists.txt?rev=1651122&r1=1651121&r2=1651122&view=diff
==============================================================================
--- celix/trunk/remote_services/remote_service_admin_shm/CMakeLists.txt (original)
+++ celix/trunk/remote_services/remote_service_admin_shm/CMakeLists.txt Mon Jan 12 15:31:02 2015
@@ -14,7 +14,7 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-celix_subproject(RSA_BUNDLES_REMOTE_SERVICE_ADMIN_SHM "Option to enable building the Remote Service Admin Service SHM bundle" ON DEPS LAUNCHER topology_manager remote_service_admin)
+celix_subproject(RSA_BUNDLES_REMOTE_SERVICE_ADMIN_SHM "Option to enable building the Remote Service Admin Service SHM bundle" OFF DEPS LAUNCHER topology_manager remote_service_admin)
if (RSA_BUNDLES_REMOTE_SERVICE_ADMIN_SHM)
link_directories("/opt/local/lib")
include_directories("/opt/local/include")
Modified: celix/trunk/utils/CMakeLists.txt
URL: http://svn.apache.org/viewvc/celix/trunk/utils/CMakeLists.txt?rev=1651122&r1=1651121&r2=1651122&view=diff
==============================================================================
--- celix/trunk/utils/CMakeLists.txt (original)
+++ celix/trunk/utils/CMakeLists.txt Mon Jan 12 15:31:02 2015
@@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.
-celix_subproject(UTILS "Option to build the utilities library" "ON")
+celix_subproject(UTILS "Option to build the utilities library" "OFF")
if (UTILS)
cmake_minimum_required(VERSION 2.6)