celix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pnol...@apache.org
Subject celix git commit: CELIX-237: updated CMakeLists. for include dirs (janson/libffi) and libs (libffi)
Date Sat, 04 Jul 2015 14:14:43 GMT
Repository: celix
Updated Branches:
  refs/heads/feature/CELIX-237_rsa-ffi 4f7c48000 -> c4f2daf5a


CELIX-237: updated CMakeLists. for include dirs (janson/libffi) and libs (libffi)


Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/c4f2daf5
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/c4f2daf5
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/c4f2daf5

Branch: refs/heads/feature/CELIX-237_rsa-ffi
Commit: c4f2daf5a53789618bf7e84183d13388eff2892b
Parents: 4f7c480
Author: Pepijn Noltes <pepijnnoltes@gmail.com>
Authored: Sat Jul 4 16:20:16 2015 +0200
Committer: Pepijn Noltes <pepijnnoltes@gmail.com>
Committed: Sat Jul 4 16:20:16 2015 +0200

----------------------------------------------------------------------
 .../CMakeLists.txt                              | 60 +++++++++++---------
 1 file changed, 33 insertions(+), 27 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/celix/blob/c4f2daf5/remote_services/remote_service_admin_http_ffi/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/remote_services/remote_service_admin_http_ffi/CMakeLists.txt b/remote_services/remote_service_admin_http_ffi/CMakeLists.txt
index ea94b16..1b9b823 100644
--- a/remote_services/remote_service_admin_http_ffi/CMakeLists.txt
+++ b/remote_services/remote_service_admin_http_ffi/CMakeLists.txt
@@ -16,34 +16,40 @@
 # under the License.
 celix_subproject(RSA_REMOTE_SERVICE_ADMIN_HTTP "Option to enable building the Remote Service
Admin Service HTTP ffi" OFF)
 if (RSA_REMOTE_SERVICE_ADMIN_HTTP)
-	find_package(CURL REQUIRED)
-  find_package(Jansson REQUIRED)
-
-	include_directories(${CURL_INCLUDE_DIRS})
-  include_directories(${Jansson})
-	include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
-	include_directories("${PROJECT_SOURCE_DIR}/log_service/public/include")
-	include_directories("${PROJECT_SOURCE_DIR}/remote_services/utils/private/include")
-	include_directories("${PROJECT_SOURCE_DIR}/remote_services/utils/public/include")
-	include_directories("${PROJECT_SOURCE_DIR}/remote_services/remote_service_admin/public/include")
-	include_directories("${PROJECT_SOURCE_DIR}/remote_services/remote_service_admin/private/include")
-	include_directories("${PROJECT_SOURCE_DIR}/remote_services/remote_service_admin_http/private/include")
-	include_directories("${PROJECT_SOURCE_DIR}/remote_services/endpoint_listener/public/include")
-
-	SET_HEADER(BUNDLE_SYMBOLICNAME "apache_celix_remote_service_admin_http_ffi")
-	SET(BUNDLE_VERSION "0.0.1")
-  SET_HEADERS("Bundle-Name: Apache Celix Remote Service Admin HTTP for ffi")
-
-	bundle(remote_service_admin_http SOURCES
-	private/src/remote_service_admin_impl
-	private/src/remote_service_admin_activator
-	${PROJECT_SOURCE_DIR}/remote_services/remote_service_admin/private/src/export_registration_impl
-	${PROJECT_SOURCE_DIR}/remote_services/remote_service_admin/private/src/import_registration_impl
-	${PROJECT_SOURCE_DIR}/remote_services/utils/private/src/civetweb.c
-	${PROJECT_SOURCE_DIR}/log_service/public/src/log_helper.c
-  )
+    find_package(CURL REQUIRED)
+    find_package(Jansson REQUIRED)
+    
+    #TODO add findPackage for libffi
+    #set(FFI_INCLUDE /opt/local/lib/libffi-3.2.1/include)
+    #set(FFI_LIB /opt/local/lib/libffi.dylib) 
+    set(FFI_LIB /lib/libffi.so)
+     
+    include_directories(${FFI_INCLUDE})
+    include_directories(${CURL_INCLUDE_DIRS})
+    include_directories(${JANSSON_INCLUDE_DIRS})
+    include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
+    include_directories("${PROJECT_SOURCE_DIR}/log_service/public/include")
+    include_directories("${PROJECT_SOURCE_DIR}/remote_services/utils/private/include")
+    include_directories("${PROJECT_SOURCE_DIR}/remote_services/utils/public/include")
+    include_directories("${PROJECT_SOURCE_DIR}/remote_services/remote_service_admin/public/include")
+    include_directories("${PROJECT_SOURCE_DIR}/remote_services/remote_service_admin/private/include")
+    include_directories("${PROJECT_SOURCE_DIR}/remote_services/remote_service_admin_http/private/include")
+    include_directories("${PROJECT_SOURCE_DIR}/remote_services/endpoint_listener/public/include")
+    
+    SET_HEADER(BUNDLE_SYMBOLICNAME "apache_celix_remote_service_admin_http_ffi")
+    SET(BUNDLE_VERSION "0.0.1")
+    SET_HEADERS("Bundle-Name: Apache Celix Remote Service Admin HTTP for ffi")
+    
+    bundle(remote_service_admin_http SOURCES
+    private/src/remote_service_admin_impl
+    private/src/remote_service_admin_activator
+    ${PROJECT_SOURCE_DIR}/remote_services/remote_service_admin/private/src/export_registration_impl
+    ${PROJECT_SOURCE_DIR}/remote_services/remote_service_admin/private/src/import_registration_impl
+    ${PROJECT_SOURCE_DIR}/remote_services/utils/private/src/civetweb.c
+    ${PROJECT_SOURCE_DIR}/log_service/public/src/log_helper.c
+    )
 
 	install_bundle(remote_service_admin_http)
 
-  target_link_libraries(remote_service_admin_http celix_framework ${CURL_LIBRARIES} ${JANSSON_LIBRARIES}
/lib64/libffi.so ) 
+  target_link_libraries(remote_service_admin_http celix_framework ${CURL_LIBRARIES} ${JANSSON_LIBRARIES}
${FFI_LIB}) 
 endif (RSA_REMOTE_SERVICE_ADMIN_HTTP)


Mime
View raw message