Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'master' of git://github.com/stevedekorte/io

Conflicts:
	addons/CMakeLists.txt
  • Loading branch information...
commit 921652515dc559a2004b64b97c68d58a14990d12 2 parents b7af7b6 + eb8a10a
@omf authored
View
4 addons/CMakeLists.txt
@@ -102,7 +102,9 @@ add_subdirectory(SQLite3)
#add_subdirectory(SampleRateConverter)
add_subdirectory(SecureSocket)
#add_subdirectory(SkipDB) # XXX: Disabled...why?
-add_subdirectory(Socket)
+if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD") # This should not be disabled for any platform. Upgrade Socket to support libevent2
+ add_subdirectory(Socket)
+endif(NOT ${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
#add_subdirectory(SoundTouch) # XXX: I can't meet dependencies
add_subdirectory(SqlDatabase)
add_subdirectory(Syslog)
View
2  addons/UUID/CMakeLists.txt
@@ -32,7 +32,7 @@ if(UUID_FOUND)
# Now build the shared library
add_library(IoUUID SHARED ${SRCS})
add_dependencies(IoUUID iovmall)
- target_link_libraries(IoUUID iovmall uuid)
+ target_link_libraries(IoUUID iovmall ${UUID_LIBRARY})
# Install the addon to our global addons hierarchy.
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION lib/io/addons)
View
5 modules/FindUUID.cmake
@@ -4,6 +4,11 @@
# Find libuuid
FIND_PATH(UUID_INCLUDE_DIR uuid/uuid.h)
+FIND_LIBRARY(UUID_LIBRARY NAMES uuid PATH)
+
+IF(NOT UUID_LIBRARY)
+ SET(UUID_LIBRARY "")
+ENDIF(NOT UUID_LIBRARY)
IF(UUID_INCLUDE_DIR)
SET(UUID_FOUND TRUE)
Please sign in to comment.
Something went wrong with that request. Please try again.