celix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pnol...@apache.org
Subject [19/21] celix git commit: CELIX-269: Fixed a warning and some cmake issue under mac
Date Tue, 03 Nov 2015 11:09:56 GMT
CELIX-269: Fixed a warning and some cmake issue under mac


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

Branch: refs/heads/develop
Commit: f5a3cdd1aca80378d0bde8df1398c8ab30eafa95
Parents: 59c8e5d
Author: Pepijn Noltes <pepijnnoltes@gmail.com>
Authored: Mon Nov 2 19:40:57 2015 +0100
Committer: Pepijn Noltes <pepijnnoltes@gmail.com>
Committed: Mon Nov 2 19:40:57 2015 +0100

----------------------------------------------------------------------
 CMakeLists.txt                            | 5 ++++-
 dependency_manager/CMakeLists.txt         | 3 +++
 dependency_manager/private/src/dm_event.c | 2 +-
 examples/dm_example/deploy.cmake          | 4 ++--
 4 files changed, 10 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/celix/blob/f5a3cdd1/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d91418d..2a390f8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -35,7 +35,10 @@ IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} EQUAL 3.3 AND ${CMAKE_GENERATO
 ENDIF()
 
 IF(UNIX)
-	SET(CMAKE_C_FLAGS "-D_GNU_SOURCE -std=gnu99 -Wall -pthread ${CMAKE_C_FLAGS}")
+	SET(CMAKE_C_FLAGS "-D_GNU_SOURCE -std=gnu99 -Wall ${CMAKE_C_FLAGS}")
+ENDIF()
+IF(UNIX AND NOT APPLE) 
+	SET(CMAKE_C_FLAGS "-pthread ${CMAKE_C_FLAGS}")
     set(CMAKE_EXE_LINKER_FLAGS "-pthread ${CMAKE_EXE_LINKER_FLAGS}")
 ENDIF()
 IF(WIN32)

http://git-wip-us.apache.org/repos/asf/celix/blob/f5a3cdd1/dependency_manager/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/dependency_manager/CMakeLists.txt b/dependency_manager/CMakeLists.txt
index e4aeca1..7e86931 100644
--- a/dependency_manager/CMakeLists.txt
+++ b/dependency_manager/CMakeLists.txt
@@ -41,6 +41,9 @@ if (DEPENDENCY_MANAGER)
             private/src/dm_shell_activator
             private/src/dm_shell_list_command
     )
+    target_link_libraries(dm_shell celix_framework celix_utils)
+
+
     add_library(dependency_manager STATIC 
     	private/src/dm_activator_base 
     	private/src/dm_component_impl 

http://git-wip-us.apache.org/repos/asf/celix/blob/f5a3cdd1/dependency_manager/private/src/dm_event.c
----------------------------------------------------------------------
diff --git a/dependency_manager/private/src/dm_event.c b/dependency_manager/private/src/dm_event.c
index 3fc7241..491c69f 100644
--- a/dependency_manager/private/src/dm_event.c
+++ b/dependency_manager/private/src/dm_event.c
@@ -92,7 +92,7 @@ celix_status_t event_equals(void *a, void *b, bool *equals) {
 }
 
 celix_status_t event_compareTo(dm_event_pt event, dm_event_pt compareTo, int *compare) {
-	celix_status_t status;
+	celix_status_t status = CELIX_SUCCESS;
 
 	*compare = utils_compareServiceIdsAndRanking(event->serviceId, event->ranking, compareTo->serviceId,
compareTo->ranking);
 

http://git-wip-us.apache.org/repos/asf/celix/blob/f5a3cdd1/examples/dm_example/deploy.cmake
----------------------------------------------------------------------
diff --git a/examples/dm_example/deploy.cmake b/examples/dm_example/deploy.cmake
index 9cf2c10..47072f4 100644
--- a/examples/dm_example/deploy.cmake
+++ b/examples/dm_example/deploy.cmake
@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-if (BUILD_DEPENDENCY_MANAGER AND BUILD_SHELL AND BUILD_SHELL_TUI)
+if (BUILD_EXAMPLES AND BUILD_DEPENDENCY_MANAGER AND BUILD_SHELL AND BUILD_SHELL_TUI)
     deploy("dm_example"
             BUNDLES
             phase1
@@ -25,5 +25,5 @@ if (BUILD_DEPENDENCY_MANAGER AND BUILD_SHELL AND BUILD_SHELL_TUI)
             shell_tui
             dm_shell
     )
-endif()
+endif ()
 


Mime
View raw message