You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@celix.apache.org by ab...@apache.org on 2014/06/12 08:27:11 UTC
svn commit: r1602069 - in /incubator/celix/trunk:
cmake/modules/FindUUID.cmake framework/CMakeLists.txt
Author: abroekhuis
Date: Thu Jun 12 06:27:11 2014
New Revision: 1602069
URL: http://svn.apache.org/r1602069
Log:
CELIX-122: Updated FindUUID to work on OSX.
Modified:
incubator/celix/trunk/cmake/modules/FindUUID.cmake
incubator/celix/trunk/framework/CMakeLists.txt
Modified: incubator/celix/trunk/cmake/modules/FindUUID.cmake
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/cmake/modules/FindUUID.cmake?rev=1602069&r1=1602068&r2=1602069&view=diff
==============================================================================
--- incubator/celix/trunk/cmake/modules/FindUUID.cmake (original)
+++ incubator/celix/trunk/cmake/modules/FindUUID.cmake Thu Jun 12 06:27:11 2014
@@ -24,8 +24,14 @@ find_library(UUID_LIBRARY NAMES uuid
PATHS /usr/lib /usr/local/lib /usr/lib64 /usr/local/lib64 /lib/i386-linux-gnu /lib/x86_64-linux-gnu /usr/lib/x86_64-linux-gnu)
include(FindPackageHandleStandardArgs)
+if (APPLE)
+find_package_handle_standard_args(UUID DEFAULT_MSG
+ UUID_INCLUDE_DIR)
+else ()
find_package_handle_standard_args(UUID DEFAULT_MSG
UUID_LIBRARY UUID_INCLUDE_DIR)
+endif ()
+
mark_as_advanced(UUID_INCLUDE_DIR UUID_LIBRARY)
Modified: incubator/celix/trunk/framework/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/CMakeLists.txt?rev=1602069&r1=1602068&r2=1602069&view=diff
==============================================================================
--- incubator/celix/trunk/framework/CMakeLists.txt (original)
+++ incubator/celix/trunk/framework/CMakeLists.txt Thu Jun 12 06:27:11 2014
@@ -67,7 +67,10 @@ if (FRAMEWORK)
${IO}
)
- target_link_libraries(celix_framework celix_utils ${UUID_LIBRARY} ${ZLIB_LIBRARY} ${APR_LIBRARY})
+ if(NOT APPLE)
+ set(UUID ${UUID_LIBRARY})
+ endif()
+ target_link_libraries(celix_framework celix_utils ${UUID} ${ZLIB_LIBRARY} ${APR_LIBRARY})
install(TARGETS celix_framework DESTINATION lib COMPONENT framework)
FILE(GLOB files "public/include/*.h")