CELIX-119: Remove apr from device_access
Project: http://git-wip-us.apache.org/repos/asf/celix/repo Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/b0688a4d Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/b0688a4d Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/b0688a4d Branch: refs/heads/feature/CELIX-237_rsa-ffi Commit: b0688a4d9154ade806a2f4d284127469f92ed787 Parents: 57a1578 Author: Bjoern Petri <bpe...@apache.org> Authored: Tue Aug 11 16:16:32 2015 +0200 Committer: Bjoern Petri <bpe...@apache.org> Committed: Tue Aug 11 16:16:32 2015 +0200 ---------------------------------------------------------------------- .travis.yml | 2 +- device_access/device_access/CMakeLists.txt | 2 -- device_access/driver_locator/CMakeLists.txt | 2 -- device_access/example/base_driver/CMakeLists.txt | 2 -- device_access/example/consuming_driver/CMakeLists.txt | 2 -- device_access/example/refining_driver/CMakeLists.txt | 2 -- 6 files changed, 1 insertion(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/celix/blob/b0688a4d/.travis.yml ---------------------------------------------------------------------- diff --git a/.travis.yml b/.travis.yml index d66498f..bb53363 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,7 @@ matrix: before_script: - mkdir build install - cd build - - cmake -DBUILD_DEPLOYMENT_ADMIN=ON -DBUILD_EXAMPLES=ON -DBUILD_LOG_SERVICE=ON -DBUILD_LOG_WRITER=ON -DBUILD_REMOTE_SERVICE_ADMIN=ON -DBUILD_RSA_DISCOVERY_CONFIGURED=ON -DBUILD_RSA_DISCOVERY_ETCD=ON -DBUILD_RSA_DISCOVERY_SHM=ON -DBUILD_RSA_EXAMPLES=ON -DBUILD_RSA_REMOTE_SERVICE_ADMIN_SHM=ON -DBUILD_RSA_REMOTE_SERVICE_ADMIN_HTTP=ON -DBUILD_REMOTE_SHELL=ON -DBUILD_SHELL=ON -DBUILD_SHELL_TUI=ON -DCMAKE_INSTALL_PREFIX=../install .. + - cmake -DBUILD_DEPLOYMENT_ADMIN=ON -DBUILD_EXAMPLES=ON -DBUILD_LOG_SERVICE=ON -DBUILD_LOG_WRITER=ON -DBUILD_REMOTE_SERVICE_ADMIN=ON -DBUILD_RSA_DISCOVERY_CONFIGURED=ON -DBUILD_RSA_DISCOVERY_ETCD=ON -DBUILD_RSA_DISCOVERY_SHM=ON -DBUILD_RSA_EXAMPLES=ON -DBUILD_RSA_REMOTE_SERVICE_ADMIN_SHM=ON -DBUILD_RSA_REMOTE_SERVICE_ADMIN_HTTP=ON -DBUILD_REMOTE_SHELL=ON -DBUILD_SHELL=ON -DBUILD_SHELL_TUI=ON -DBUILD_DEVICE_ACCESS=ON -DBUILD_DEVICE_ACCESS_EXAMPLE=ON -DCMAKE_INSTALL_PREFIX=../install .. script: - make all && make deploy && make install http://git-wip-us.apache.org/repos/asf/celix/blob/b0688a4d/device_access/device_access/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/device_access/device_access/CMakeLists.txt b/device_access/device_access/CMakeLists.txt index 7d7b79b..03e7817 100644 --- a/device_access/device_access/CMakeLists.txt +++ b/device_access/device_access/CMakeLists.txt @@ -15,8 +15,6 @@ # specific language governing permissions and limitations # under the License. -find_package(APR REQUIRED) - SET_HEADER(BUNDLE_SYMBOLICNAME "apache_celix_device_manager") SET(BUNDLE_VERSION "0.0.1") SET_HEADERS("Bundle-Name: Apache Celix Device Access Device Manager") http://git-wip-us.apache.org/repos/asf/celix/blob/b0688a4d/device_access/driver_locator/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/device_access/driver_locator/CMakeLists.txt b/device_access/driver_locator/CMakeLists.txt index 61d25f9..f47696a 100644 --- a/device_access/driver_locator/CMakeLists.txt +++ b/device_access/driver_locator/CMakeLists.txt @@ -15,8 +15,6 @@ # specific language governing permissions and limitations # under the License. -find_package(APR REQUIRED) - SET_HEADER(BUNDLE_SYMBOLICNAME "apache_celix_driver_locator") SET(BUNDLE_VERSION "0.0.1") SET_HEADERS("Bundle-Name: Apache Celix Device Access Driver Locator") http://git-wip-us.apache.org/repos/asf/celix/blob/b0688a4d/device_access/example/base_driver/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/device_access/example/base_driver/CMakeLists.txt b/device_access/example/base_driver/CMakeLists.txt index ffed3d3..82b916e 100644 --- a/device_access/example/base_driver/CMakeLists.txt +++ b/device_access/example/base_driver/CMakeLists.txt @@ -15,8 +15,6 @@ # specific language governing permissions and limitations # under the License. -find_package(APR REQUIRED) - SET_HEADER(BUNDLE_SYMBOLICNAME "apache_celix_base_driver_example") SET(BUNDLE_VERSION "0.0.1") SET_HEADERS("Bundle-Name: Apache Celix Device Access Base Driver Example") http://git-wip-us.apache.org/repos/asf/celix/blob/b0688a4d/device_access/example/consuming_driver/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/device_access/example/consuming_driver/CMakeLists.txt b/device_access/example/consuming_driver/CMakeLists.txt index bb6795b..96dc8e8 100644 --- a/device_access/example/consuming_driver/CMakeLists.txt +++ b/device_access/example/consuming_driver/CMakeLists.txt @@ -15,8 +15,6 @@ # specific language governing permissions and limitations # under the License. -find_package(APR REQUIRED) - SET_HEADER(BUNDLE_SYMBOLICNAME "apache_celix_word_consuming_driver_example") SET(BUNDLE_VERSION "0.0.1") SET_HEADERS("Bundle-Name: Apache Celix Device Access Word Consuming Driver Example") http://git-wip-us.apache.org/repos/asf/celix/blob/b0688a4d/device_access/example/refining_driver/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/device_access/example/refining_driver/CMakeLists.txt b/device_access/example/refining_driver/CMakeLists.txt index 33dff1e..df5470b 100644 --- a/device_access/example/refining_driver/CMakeLists.txt +++ b/device_access/example/refining_driver/CMakeLists.txt @@ -15,8 +15,6 @@ # specific language governing permissions and limitations # under the License. -find_package(APR REQUIRED) - SET_HEADER(BUNDLE_SYMBOLICNAME "apache_celix_char_refining_driver_example") SET(BUNDLE_VERSION "0.0.1") SET_HEADERS("Bundle-Name: Apache Celix Device Access Char Refining Driver Example")