Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 525188 | Differences between
and this patch

Collapse All | Expand All

(-)./CMakeLists.txt (-3 / +3 lines)
Lines 13-19 set(CMAKE_CXX_FLAGS_RHDEBINFO "-O3 -g ${ Link Here
13
set(CMAKE_CXX_FLAGS_MINSIZEREL "-Os ${CMAKE_CXX_FLAGS}")
13
set(CMAKE_CXX_FLAGS_MINSIZEREL "-Os ${CMAKE_CXX_FLAGS}")
14
14
15
set(CMAKE_BUILD_TYPE Release)
15
set(CMAKE_BUILD_TYPE Release)
16
set(Boost_USE_STATIC_LIBS ON)
16
set(Boost_USE_STATIC_LIBS OFF)
17
17
18
find_package(Boost 1.39
18
find_package(Boost 1.39
19
    COMPONENTS
19
    COMPONENTS
Lines 33-42 endif(GPERFTOOLS_TCMALLOC_LIB) Link Here
33
33
34
find_package(Protobuf)
34
find_package(Protobuf)
35
if (PROTOBUF_FOUND)
35
if (PROTOBUF_FOUND)
36
  include_directories(${Boost_INCLUDE_DIRS} ${PROTOBUF_INCLUDE_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/bamtools/include") 
36
  include_directories(${Boost_INCLUDE_DIRS} ${PROTOBUF_INCLUDE_DIR} $ENV{BAMTOOLS_INCLUDE})
37
	set(PROTO_INT 1)
37
	set(PROTO_INT 1)
38
else (PROTOBUF_FOUND)
38
else (PROTOBUF_FOUND)
39
  include_directories(${Boost_INCLUDE_DIRS} "${CMAKE_CURRENT_SOURCE_DIR}/bamtools/include") 
39
  include_directories(${Boost_INCLUDE_DIRS} $ENV{BAMTOOLS_INCLUDE})
40
	set(PROTO_INT 0)
40
	set(PROTO_INT 0)
41
endif(PROTOBUF_FOUND)
41
endif(PROTOBUF_FOUND)
42
42
(-)./src/CMakeLists.txt (-2 / +2 lines)
Lines 16-26 endif (GPERFTOOLS_TCMALLOC) Link Here
16
if(WIN32)
16
if(WIN32)
17
  set(LIBRARIES ${LIBRARIES} "${CMAKE_CURRENT_SOURCE_DIR}/../bamtools/lib/libbamtools.lib" "${CMAKE_CURRENT_SOURCE_DIR}/../win_build/zlibd.lib")
17
  set(LIBRARIES ${LIBRARIES} "${CMAKE_CURRENT_SOURCE_DIR}/../bamtools/lib/libbamtools.lib" "${CMAKE_CURRENT_SOURCE_DIR}/../win_build/zlibd.lib")
18
else(WIN32)
18
else(WIN32)
19
  set(LIBRARIES ${LIBRARIES} "${CMAKE_CURRENT_SOURCE_DIR}/../bamtools/lib/libbamtools.a" "pthread")
19
  set(LIBRARIES ${LIBRARIES} "bamtools" "pthread")
20
endif(WIN32)
20
endif(WIN32)
21
21
22
if (PROTOBUF_FOUND)
22
if (PROTOBUF_FOUND)
23
  set(LIBRARIES ${LIBRARIES} "libprotobuf.a")
23
  set(LIBRARIES ${LIBRARIES} "protobuf")
24
endif(PROTOBUF_FOUND)
24
endif(PROTOBUF_FOUND)
25
25
26
target_link_libraries(express ${LIBRARIES})
26
target_link_libraries(express ${LIBRARIES})

Return to bug 525188