Author: abroekhuis
Date: Tue Jan 15 07:09:45 2013
New Revision: 1433298
URL: http://svn.apache.org/viewvc?rev=1433298&view=rev
Log:
CELIX-45: Fixed include paths
Applied patch to fix some include paths from a static entry to the correct
CMake variable.
Modified:
incubator/celix/trunk/remote_services/discovery/CMakeLists.txt
incubator/celix/trunk/remote_services/example_endpoint/CMakeLists.txt
incubator/celix/trunk/remote_services/example_proxy/CMakeLists.txt
Modified: incubator/celix/trunk/remote_services/discovery/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/discovery/CMakeLists.txt?rev=1433298&r1=1433297&r2=1433298&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/discovery/CMakeLists.txt (original)
+++ incubator/celix/trunk/remote_services/discovery/CMakeLists.txt Tue Jan 15
07:09:45 2013
@@ -17,15 +17,13 @@
find_package(Slp REQUIRED)
-include_directories("/opt/local/include")
+include_directories(${SLP_INCLUDE_DIRS})
include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
include_directories("${PROJECT_SOURCE_DIR}/remote_services/utils/public/include")
include_directories("${PROJECT_SOURCE_DIR}/remote_services/discovery/private/include")
include_directories("${PROJECT_SOURCE_DIR}/remote_services/endpoint_listener/public/include")
include_directories("${PROJECT_SOURCE_DIR}/remote_services/remote_service_admin/public/include")
-link_directories("/opt/local/lib")
-
SET_HEADER(BUNDLE_SYMBOLICNAME "apache_celix_rsa_discovery_slp")
SET_HEADERS("Bundle-Name: Apache Celix RSA SLP Discovery")
Modified: incubator/celix/trunk/remote_services/example_endpoint/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/example_endpoint/CMakeLists.txt?rev=1433298&r1=1433297&r2=1433298&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/example_endpoint/CMakeLists.txt
(original)
+++ incubator/celix/trunk/remote_services/example_endpoint/CMakeLists.txt Tue
Jan 15 07:09:45 2013
@@ -17,8 +17,7 @@
find_package(Jansson REQUIRED)
-link_directories("/opt/local/lib")
-include_directories("/opt/local/include")
+include_directories(${JANSSON_INCLUDE_DIRS})
include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
include_directories("${PROJECT_SOURCE_DIR}/remote_services/remote_service_admin/public/include")
include_directories("${PROJECT_SOURCE_DIR}/remote_services/example_endpoint/private/include")
Modified: incubator/celix/trunk/remote_services/example_proxy/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/example_proxy/CMakeLists.txt?rev=1433298&r1=1433297&r2=1433298&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/example_proxy/CMakeLists.txt
(original)
+++ incubator/celix/trunk/remote_services/example_proxy/CMakeLists.txt Tue Jan
15 07:09:45 2013
@@ -18,8 +18,7 @@
find_package(Jansson REQUIRED)
find_package(CURL REQUIRED)
-link_directories("/opt/local/lib")
-include_directories("/opt/local/include")
+include_directories(${JANSSON_INCLUDE_DIRS})
include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
include_directories("${PROJECT_SOURCE_DIR}/remote_services/remote_service_admin/public/include")
include_directories("${PROJECT_SOURCE_DIR}/remote_services/example_endpoint/private/include")
