CELIX-255: Changed default values to ON for a set of BUILD_* options.
Project: http://git-wip-us.apache.org/repos/asf/celix/repo Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/e0a51953 Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/e0a51953 Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/e0a51953 Branch: refs/heads/develop Commit: e0a51953fc2de5f589a207fc08bce80a50e8a944 Parents: 5c5a0eb Author: Pepijn Noltes <[email protected]> Authored: Tue Sep 1 16:27:34 2015 +0200 Committer: Pepijn Noltes <[email protected]> Committed: Tue Sep 1 16:27:34 2015 +0200 ---------------------------------------------------------------------- dependency_manager_2/CMakeLists.txt | 2 +- deployment_admin/CMakeLists.txt | 2 +- log_service/CMakeLists.txt | 2 +- log_writer/CMakeLists.txt | 2 +- remote_services/discovery_configured/CMakeLists.txt | 2 +- remote_services/discovery_etcd/CMakeLists.txt | 2 +- remote_services/examples/CMakeLists.txt | 2 +- remote_services/remote_service_admin_http/CMakeLists.txt | 2 +- remote_shell/CMakeLists.txt | 4 ++-- shell/CMakeLists.txt | 2 +- shell_tui/CMakeLists.txt | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/celix/blob/e0a51953/dependency_manager_2/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/dependency_manager_2/CMakeLists.txt b/dependency_manager_2/CMakeLists.txt index 7aecc61..373cd34 100644 --- a/dependency_manager_2/CMakeLists.txt +++ b/dependency_manager_2/CMakeLists.txt @@ -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" "OFF" DEPS framework) +celix_subproject(DEPENDENCY_MANAGER2 "Option to build the dependency manager static library" ON 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) http://git-wip-us.apache.org/repos/asf/celix/blob/e0a51953/deployment_admin/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/deployment_admin/CMakeLists.txt b/deployment_admin/CMakeLists.txt index cd267bf..cff425d 100644 --- a/deployment_admin/CMakeLists.txt +++ b/deployment_admin/CMakeLists.txt @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. -celix_subproject(DEPLOYMENT_ADMIN "Option to enable building the Deployment Admin Service bundles" OFF DEPS framework launcher shell_tui log_writer) +celix_subproject(DEPLOYMENT_ADMIN "Option to enable building the Deployment Admin Service bundles" ON DEPS framework launcher shell_tui log_writer) if (DEPLOYMENT_ADMIN) find_package(CURL REQUIRED) http://git-wip-us.apache.org/repos/asf/celix/blob/e0a51953/log_service/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/log_service/CMakeLists.txt b/log_service/CMakeLists.txt index 933c2fb..b431db0 100644 --- a/log_service/CMakeLists.txt +++ b/log_service/CMakeLists.txt @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. -celix_subproject(LOG_SERVICE "Option to enable building the Log Service bundles" "OFF" DEPS framework) +celix_subproject(LOG_SERVICE "Option to enable building the Log Service bundles" ON DEPS framework) if (LOG_SERVICE) SET_HEADER(BUNDLE_VERSION "1.0.0") http://git-wip-us.apache.org/repos/asf/celix/blob/e0a51953/log_writer/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/log_writer/CMakeLists.txt b/log_writer/CMakeLists.txt index d98b311..4692d7a 100644 --- a/log_writer/CMakeLists.txt +++ b/log_writer/CMakeLists.txt @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. -celix_subproject(LOG_WRITER "Option to enable building the Log Writer bundles" "OFF" DEPS FRAMEWORK LOG_SERVICE) +celix_subproject(LOG_WRITER "Option to enable building the Log Writer bundles" ON DEPS FRAMEWORK LOG_SERVICE) if (LOG_WRITER) add_subdirectory(log_writer_stdout) add_subdirectory(log_writer_syslog) http://git-wip-us.apache.org/repos/asf/celix/blob/e0a51953/remote_services/discovery_configured/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/remote_services/discovery_configured/CMakeLists.txt b/remote_services/discovery_configured/CMakeLists.txt index 9b8fa09..9fc6a81 100644 --- a/remote_services/discovery_configured/CMakeLists.txt +++ b/remote_services/discovery_configured/CMakeLists.txt @@ -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_DISCOVERY_CONFIGURED "Option to enable building the Discovery (Configured) bundle" OFF) +celix_subproject(RSA_DISCOVERY_CONFIGURED "Option to enable building the Discovery (Configured) bundle" ON) if (RSA_DISCOVERY_CONFIGURED) find_package(CURL REQUIRED) find_package(LibXml2 REQUIRED) http://git-wip-us.apache.org/repos/asf/celix/blob/e0a51953/remote_services/discovery_etcd/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/remote_services/discovery_etcd/CMakeLists.txt b/remote_services/discovery_etcd/CMakeLists.txt index abc5905..aa1e08c 100644 --- a/remote_services/discovery_etcd/CMakeLists.txt +++ b/remote_services/discovery_etcd/CMakeLists.txt @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. -celix_subproject(RSA_DISCOVERY_ETCD "Option to enable building the Discovery (ETCD) bundle" OFF) +celix_subproject(RSA_DISCOVERY_ETCD "Option to enable building the Discovery (ETCD) bundle" ON) if (RSA_DISCOVERY_ETCD) find_package(CURL REQUIRED) find_package(LibXml2 REQUIRED) http://git-wip-us.apache.org/repos/asf/celix/blob/e0a51953/remote_services/examples/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/remote_services/examples/CMakeLists.txt b/remote_services/examples/CMakeLists.txt index d975cc2..9246a0f 100644 --- a/remote_services/examples/CMakeLists.txt +++ b/remote_services/examples/CMakeLists.txt @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. -celix_subproject(RSA_EXAMPLES "Option to enable building the RSA examples" OFF DEPS LAUNCHER shell_tui log_writer RSA_TOPOLOGY_MANAGER) +celix_subproject(RSA_EXAMPLES "Option to enable building the RSA examples" ON DEPS LAUNCHER shell_tui log_writer RSA_TOPOLOGY_MANAGER) if (RSA_EXAMPLES) add_subdirectory(calculator_service) http://git-wip-us.apache.org/repos/asf/celix/blob/e0a51953/remote_services/remote_service_admin_http/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/remote_services/remote_service_admin_http/CMakeLists.txt b/remote_services/remote_service_admin_http/CMakeLists.txt index f066407..a147a37 100644 --- a/remote_services/remote_service_admin_http/CMakeLists.txt +++ b/remote_services/remote_service_admin_http/CMakeLists.txt @@ -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_REMOTE_SERVICE_ADMIN_HTTP "Option to enable building the Remote Service Admin Service HTTP bundle" OFF) +celix_subproject(RSA_REMOTE_SERVICE_ADMIN_HTTP "Option to enable building the Remote Service Admin Service HTTP bundle" ON) if (RSA_REMOTE_SERVICE_ADMIN_HTTP) find_package(CURL REQUIRED) find_package(UUID REQUIRED) http://git-wip-us.apache.org/repos/asf/celix/blob/e0a51953/remote_shell/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/remote_shell/CMakeLists.txt b/remote_shell/CMakeLists.txt index 892fc48..e945415 100644 --- a/remote_shell/CMakeLists.txt +++ b/remote_shell/CMakeLists.txt @@ -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(REMOTE_SHELL "Option to enable building the Remote Shell bundles" OFF DEPS LAUNCHER SHELL_TUI) +celix_subproject(REMOTE_SHELL "Option to enable building the Remote Shell bundles" ON DEPS LAUNCHER SHELL_TUI) if (REMOTE_SHELL) SET_HEADER(BUNDLE_SYMBOLICNAME "apache_celix_remote_shell") @@ -41,4 +41,4 @@ if (REMOTE_SHELL) include_directories("${PROJECT_SOURCE_DIR}/log_service/public/include") target_link_libraries(remote_shell celix_framework) -endif (REMOTE_SHELL) \ No newline at end of file +endif (REMOTE_SHELL) http://git-wip-us.apache.org/repos/asf/celix/blob/e0a51953/shell/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/shell/CMakeLists.txt b/shell/CMakeLists.txt index 07f4c6e..8f7c94a 100644 --- a/shell/CMakeLists.txt +++ b/shell/CMakeLists.txt @@ -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(SHELL "Option to enable building the Shell bundles" "OFF" DEPS LAUNCHER LOG_SERVICE) +celix_subproject(SHELL "Option to enable building the Shell bundles" ON DEPS LAUNCHER LOG_SERVICE) if (SHELL) find_package(CURL REQUIRED) http://git-wip-us.apache.org/repos/asf/celix/blob/e0a51953/shell_tui/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/shell_tui/CMakeLists.txt b/shell_tui/CMakeLists.txt index 65a8e9c..ab56f73 100644 --- a/shell_tui/CMakeLists.txt +++ b/shell_tui/CMakeLists.txt @@ -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(SHELL_TUI "Option to enable building the Shell Textual User Interface bundles" OFF DEPS LAUNCHER SHELL) +celix_subproject(SHELL_TUI "Option to enable building the Shell Textual User Interface bundles" ON DEPS LAUNCHER SHELL) if (SHELL_TUI) SET_HEADER(BUNDLE_VERSION "1.0.0")
