projects
/
umurmur.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c671f10
)
linking seems fine now (at least on osx)
author
Felix Morgner
<felix.morgner@gmail.com>
Mon, 13 Jan 2014 15:44:37 +0000
(16:44 +0100)
committer
Felix Morgner
<felix.morgner@gmail.com>
Mon, 13 Jan 2014 15:44:37 +0000
(16:44 +0100)
CMakeLists.txt
patch
|
blob
|
history
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index 9b2b5baf1cdae3e9c09371517b46d01d907f3ea6..e8c532ca5b166eca8e7b649f99f9d91b9c04070c 100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-9,7
+9,14
@@
include(CheckFunctionExists)
include(CheckLibraryExists)
include(CheckSymbolExists)
include(CheckLibraryExists)
include(CheckSymbolExists)
-pkg_check_modules(BASELIBS libconfig)
+pkg_check_modules(LIBCONFIG libconfig)
+pkg_check_modules(LIBPROTOBUF libprotobuf-c)
+
+if(DEFINED SSL)
+ pkg_check_modules(SSLIMP REQUIRED ${SSL})
+else()
+ pkg_check_modules(SSLIMP REQUIRED polarssl)
+endif()
check_function_exists(clock_gettime HAVE_CLOCK_GETTIME)
check_function_exists(clock_gettime HAVE_CLOCK_GETTIME)
@@
-25,13
+32,13
@@
if(NOT HAVE_CLOCK_GETTIME)
endif()
endif()
endif()
endif()
-set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0 -g")
-set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3")
-
set(SOURCE "")
add_subdirectory(src)
include_directories(include)
set(SOURCE "")
add_subdirectory(src)
include_directories(include)
+add_definitions(${LIBCONFIG_CFLAGS} ${LIBPROTOBUF_CFLAGS} ${SSLIMP_CFLAGS})
+#set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${LIBCONFIG_CFLAGS} ${LIBPROTOBUF_CFLAGS}")
+
add_executable(umurmurd ${SOURCE})
add_executable(umurmurd ${SOURCE})
-target_link_libraries(umurmurd
pthread
)
+target_link_libraries(umurmurd
${LIBCONFIG_LIBRARIES} ${LIBPROTOBUF_LIBRARIES} ${SSLIMP_LIBRARIES}
)