1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
|
Description: remove forced flags and set dynamic linking
Remove the forced flags so that Debian flags will be used, and
link dynamically to all libraries
Author: Gert Wollny <gw.fossdev@gmail.com>
Forwarded: no
--- berkeley-express.orig/CMakeLists.txt
+++ berkeley-express/CMakeLists.txt
@@ -9,14 +9,13 @@
set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
-set(CMAKE_CXX_FLAGS "-Wall")
+#set(CMAKE_CXX_FLAGS "-Wall")
+#set(CMAKE_CXX_FLAGS_DEBUG "-g ${CMAKE_CXX_FLAGS}")
+#set(CMAKE_CXX_FLAGS_RHDEBINFO "-O3 -g ${CMAKE_CXX_FLAGS}")
+#set(CMAKE_CXX_FLAGS_MINSIZEREL "-Os ${CMAKE_CXX_FLAGS}")
-set(CMAKE_CXX_FLAGS_DEBUG "-g ${CMAKE_CXX_FLAGS}")
-set(CMAKE_CXX_FLAGS_RHDEBINFO "-O3 -g ${CMAKE_CXX_FLAGS}")
-set(CMAKE_CXX_FLAGS_MINSIZEREL "-Os ${CMAKE_CXX_FLAGS}")
-
-set(CMAKE_BUILD_TYPE Release)
-set(Boost_USE_STATIC_LIBS ON)
+#set(CMAKE_BUILD_TYPE Release)
+set(Boost_USE_STATIC_LIBS OFF)
find_package(Boost 1.39
COMPONENTS
--- berkeley-express.orig/src/CMakeLists.txt
+++ berkeley-express/src/CMakeLists.txt
@@ -10,12 +10,12 @@
set(LIBRARIES ${Boost_LIBRARIES} ${BAMTOOLS_LIBRARIES})
if (GPERFTOOLS_TCMALLOC)
- set(LIBRARIES ${LIBRARIES} "libtcmalloc_minimal.a")
+ set(LIBRARIES ${LIBRARIES} "libtcmalloc_minimal.so")
endif (GPERFTOOLS_TCMALLOC)
if (PROTOBUF_FOUND)
get_filename_component(PROTOBUF_LIB_DIR ${PROTOBUF_LIBRARY} DIRECTORY)
- set(LIBRARIES ${LIBRARIES} "${PROTOBUF_LIB_DIR}/libprotobuf.a")
+ set(LIBRARIES ${LIBRARIES} "${PROTOBUF_LIB_DIR}/libprotobuf.so")
endif(PROTOBUF_FOUND)
if (WIN32)
|
