tjh.dev
1--- a/CMakeLists.txt 2023-02-01 23:55:18.171758209 +0100
2+++ b/CMakeLists.txt 2023-02-02 19:32:16.574426531 +0100
3@@ -23,25 +23,11 @@
4 set (VCFEVAL_AVAILABLE 0)
5 endif()
6
7-execute_process(
8- COMMAND ${CMAKE_SOURCE_DIR}/external/make_dependencies.sh
9- WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
10- RESULT_VARIABLE EXTERNAL_SUCCESS)
11
12-if(NOT "${EXTERNAL_SUCCESS}" STREQUAL "0")
13- message(FATAL_ERROR "Building external dependencies has failed")
14-endif()
15-
16-set(Boost_USE_STATIC_LIBS ON) # only find static libs
17 set(Boost_USE_MULTITHREADED ON)
18-set(Boost_USE_STATIC_RUNTIME ON)
19
20 # un-break library finding
21-set(Boost_NO_BOOST_CMAKE ON)
22-set(Boost_NO_SYSTEM_PATHS ON)
23
24-set(BOOST_ROOT ${CMAKE_BINARY_DIR})
25-message("Using our own Boost, which was built at ${HAPLOTYPES_SOURCE_DIR}/external/boost_install")
26
27 find_package(Boost 1.55.0 COMPONENTS thread iostreams regex unit_test_framework filesystem system program_options REQUIRED)
28 include_directories(${Boost_INCLUDE_DIRS})
29@@ -51,7 +51,8 @@
30 link_directories (${CMAKE_BINARY_DIR}/lib)
31
32 # make sure we use the bundled zlib version
33-set(ZLIB_LIBRARIES ${CMAKE_BINARY_DIR}/lib/libz.a)
34+# Additional flags for nix, found by trial and error
35+set(ZLIB_LIBRARIES -lz -lbz2 -lcurl -lcrypto -llzma)
36
37 include_directories (${HAPLOTYPES_SOURCE_DIR}/external/klib)
38 include_directories (${HAPLOTYPES_SOURCE_DIR}/external/intervaltree)
39@@ -84,11 +86,6 @@
40 ${CMAKE_THREAD_LIBS_INIT})
41
42
43-execute_process(COMMAND git describe --tags --always
44- OUTPUT_VARIABLE HAPLOTYPES_VERSION
45- WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
46- OUTPUT_STRIP_TRAILING_WHITESPACE
47-)
48
49 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/src/c++/include/Version.hh.in"
50 "${CMAKE_BINARY_DIR}/include/Version.hh")