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-229:
Date Fri, 27 Mar 2015 20:04:18 GMT
Repository: celix
Updated Branches:
  refs/heads/develop b3271bcad -> e8984dad1


CELIX-229:

* Removed unneeded APR_INCLUDE_DIR and APR_LIBRARY usage in cmake files
* corrected some missing includes


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

Branch: refs/heads/develop
Commit: e8984dad1f646edd73cba196d1d77c5dd3594ea1
Parents: b3271bc
Author: Pepijn Noltes <pepijnnoltes@gmail.com>
Authored: Fri Mar 27 21:01:18 2015 +0100
Committer: Pepijn Noltes <pepijnnoltes@gmail.com>
Committed: Fri Mar 27 21:01:18 2015 +0100

----------------------------------------------------------------------
 deployment_admin/CMakeLists.txt                                  | 4 +---
 deployment_admin/private/src/deployment_admin.c                  | 1 +
 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 +-
 .../example/refining_driver/private/src/refining_driver.c        | 1 +
 framework/private/src/service_reference.c                        | 1 +
 launcher/private/src/launcher.c                                  | 1 +
 utils/CMakeLists.txt                                             | 1 -
 11 files changed, 10 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/celix/blob/e8984dad/deployment_admin/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/deployment_admin/CMakeLists.txt b/deployment_admin/CMakeLists.txt
index cdb1acd..cd267bf 100644
--- a/deployment_admin/CMakeLists.txt
+++ b/deployment_admin/CMakeLists.txt
@@ -27,8 +27,6 @@ if (DEPLOYMENT_ADMIN)
 	SET_HEADERS("Bundle-Name: Apache Celix Deployment Admin") 
     
     include_directories("${CURL_INCLUDE_DIR}")
-    include_directories("${APR_INCLUDE_DIR}")
-    include_directories("${APRUTIL_INCLUDE_DIR}")
     include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
     include_directories("${PROJECT_SOURCE_DIR}/deployment_admin/private/include")
     include_directories("${PROJECT_SOURCE_DIR}/deployment_admin/public/include")
@@ -60,5 +58,5 @@ if (DEPLOYMENT_ADMIN)
     		public/include/resource_processor.h
 	)
     
-    target_link_libraries(deployment_admin celix_framework ${CURL_LIBRARIES} ${APR_LIBRARY}
${APRUTIL_LIBRARY})
+    target_link_libraries(deployment_admin celix_framework ${CURL_LIBRARIES})
 endif (DEPLOYMENT_ADMIN)

http://git-wip-us.apache.org/repos/asf/celix/blob/e8984dad/deployment_admin/private/src/deployment_admin.c
----------------------------------------------------------------------
diff --git a/deployment_admin/private/src/deployment_admin.c b/deployment_admin/private/src/deployment_admin.c
index 6ef80dc..8c81b59 100644
--- a/deployment_admin/private/src/deployment_admin.c
+++ b/deployment_admin/private/src/deployment_admin.c
@@ -29,6 +29,7 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <string.h>
+#include <stdint.h>
 
 #include <dirent.h>
 #include <sys/types.h>

http://git-wip-us.apache.org/repos/asf/celix/blob/e8984dad/device_access/device_access/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/device_access/device_access/CMakeLists.txt b/device_access/device_access/CMakeLists.txt
index 82b9e09..7d7b79b 100644
--- a/device_access/device_access/CMakeLists.txt
+++ b/device_access/device_access/CMakeLists.txt
@@ -52,4 +52,4 @@ include_directories("${PROJECT_SOURCE_DIR}/log_service/public/include")
 include_directories("public/include")
 include_directories("private/include")
 
-target_link_libraries(device_manager celix_framework celix_utils ${APR_LIBRARY})
+target_link_libraries(device_manager celix_framework celix_utils)

http://git-wip-us.apache.org/repos/asf/celix/blob/e8984dad/device_access/driver_locator/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/device_access/driver_locator/CMakeLists.txt b/device_access/driver_locator/CMakeLists.txt
index 29b0352..61d25f9 100644
--- a/device_access/driver_locator/CMakeLists.txt
+++ b/device_access/driver_locator/CMakeLists.txt
@@ -33,4 +33,4 @@ include_directories(private/include)
 include_directories("${PROJECT_SOURCE_DIR}/framework/public/include")
 include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
 
-target_link_libraries(driver_locator celix_utils celix_framework ${APR_LIBRARY})
+target_link_libraries(driver_locator celix_utils celix_framework)

http://git-wip-us.apache.org/repos/asf/celix/blob/e8984dad/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 5367e3e..ffed3d3 100644
--- a/device_access/example/base_driver/CMakeLists.txt
+++ b/device_access/example/base_driver/CMakeLists.txt
@@ -32,4 +32,4 @@ include_directories(public/include)
 include_directories("${PROJECT_SOURCE_DIR}/framework/public/include")
 include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
 
-target_link_libraries(base_driver celix_utils celix_framework ${APR_LIBRARY})
+target_link_libraries(base_driver celix_utils celix_framework)

http://git-wip-us.apache.org/repos/asf/celix/blob/e8984dad/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 15d4df3..bb6795b 100644
--- a/device_access/example/consuming_driver/CMakeLists.txt
+++ b/device_access/example/consuming_driver/CMakeLists.txt
@@ -32,4 +32,4 @@ include_directories(private/include)
 include_directories("${PROJECT_SOURCE_DIR}/framework/public/include")
 include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
 
-target_link_libraries(word_consumingdriver celix_utils celix_framework ${APR_LIBRARY})
+target_link_libraries(word_consumingdriver celix_utils celix_framework)

http://git-wip-us.apache.org/repos/asf/celix/blob/e8984dad/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 b284733..33dff1e 100644
--- a/device_access/example/refining_driver/CMakeLists.txt
+++ b/device_access/example/refining_driver/CMakeLists.txt
@@ -33,4 +33,4 @@ include_directories(public/include)
 include_directories("${PROJECT_SOURCE_DIR}/framework/public/include")
 include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
 
-target_link_libraries(char_refiningdriver celix_utils celix_framework ${APR_LIBRARY})
+target_link_libraries(char_refiningdriver celix_utils celix_framework)

http://git-wip-us.apache.org/repos/asf/celix/blob/e8984dad/device_access/example/refining_driver/private/src/refining_driver.c
----------------------------------------------------------------------
diff --git a/device_access/example/refining_driver/private/src/refining_driver.c b/device_access/example/refining_driver/private/src/refining_driver.c
index 9a8307d..fe3e03e 100644
--- a/device_access/example/refining_driver/private/src/refining_driver.c
+++ b/device_access/example/refining_driver/private/src/refining_driver.c
@@ -24,6 +24,7 @@
  *  \copyright	Apache License, Version 2.0
  */
 #include <stdlib.h>
+#include <string.h>
 
 #include <device.h>
 #include <bundle_context.h>

http://git-wip-us.apache.org/repos/asf/celix/blob/e8984dad/framework/private/src/service_reference.c
----------------------------------------------------------------------
diff --git a/framework/private/src/service_reference.c b/framework/private/src/service_reference.c
index 9f954c5..778877c 100644
--- a/framework/private/src/service_reference.c
+++ b/framework/private/src/service_reference.c
@@ -26,6 +26,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <constants.h>
+#include <stdint.h>
 
 #include "service_reference.h"
 

http://git-wip-us.apache.org/repos/asf/celix/blob/e8984dad/launcher/private/src/launcher.c
----------------------------------------------------------------------
diff --git a/launcher/private/src/launcher.c b/launcher/private/src/launcher.c
index 139d355..f334057 100644
--- a/launcher/private/src/launcher.c
+++ b/launcher/private/src/launcher.c
@@ -27,6 +27,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <libgen.h>
+#include <signal.h>
 
 #include <curl/curl.h>
 

http://git-wip-us.apache.org/repos/asf/celix/blob/e8984dad/utils/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt
index 6cdd34a..a6b2f4f 100644
--- a/utils/CMakeLists.txt
+++ b/utils/CMakeLists.txt
@@ -46,7 +46,6 @@ if (UTILS)
     IF(UNIX)
     	target_link_libraries(celix_utils m)
     ENDIF(UNIX)
-    target_link_libraries(celix_utils ${APR_LIBRARY})
     
     install(TARGETS celix_utils DESTINATION lib COMPONENT framework)
     FILE(GLOB files "public/include/*.h")


Mime
View raw message