Commit c2eeb69d by Maarten L. Hekkelman

optional static libs boost

parent 90c967c8
...@@ -177,7 +177,9 @@ set(THREADS_PREFER_PTHREAD_FLAG) ...@@ -177,7 +177,9 @@ set(THREADS_PREFER_PTHREAD_FLAG)
find_package(Threads) find_package(Threads)
set(Boost_DETAILED_FAILURE_MSG ON) set(Boost_DETAILED_FAILURE_MSG ON)
# set(Boost_USE_STATIC_LIBS ON) if(NOT BUILD_SHARED_LIBS)
set(Boost_USE_STATIC_LIBS ON)
endif()
find_package(Boost 1.70.0 REQUIRED COMPONENTS system iostreams regex date_time program_options OPTIONAL_COMPONENTS zlib) find_package(Boost 1.70.0 REQUIRED COMPONENTS system iostreams regex date_time program_options OPTIONAL_COMPONENTS zlib)
# Create a revision file, containing the current git version info # Create a revision file, containing the current git version info
...@@ -404,16 +406,6 @@ set(exec_prefix ${CMAKE_INSTALL_PREFIX}) ...@@ -404,16 +406,6 @@ set(exec_prefix ${CMAKE_INSTALL_PREFIX})
set(libdir ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}) set(libdir ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR})
set(includedir ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}) set(includedir ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR})
get_target_property(PRIVATE_LIBRARIES cifpp INTERFACE_LINK_LIBRARIES)
foreach(LIB ${PRIVATE_LIBRARIES})
set(PRIVATE_LIBS "${PRIVATE_LIBS} -l${LIB}")
endforeach()
get_target_property(PRIVATE_INCLUDE_DIRS cifpp INTERFACE_INCLUDE_DIRECTORIES)
foreach(INC ${PRIVATE_INCLUDE_DIRS})
set(PRIVATE_INC_DIRS "${PRIVATE_INC_DIRS} -I ${INC}")
endforeach()
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libcifpp.pc.in configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libcifpp.pc.in
${CMAKE_CURRENT_BINARY_DIR}/libcifpp.pc.in @ONLY) ${CMAKE_CURRENT_BINARY_DIR}/libcifpp.pc.in @ONLY)
file(GENERATE OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/libcifpp.pc file(GENERATE OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/libcifpp.pc
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment