Commit f192ea59 by Maarten L. Hekkelman

fixed makefile

parent 0dba28b7
...@@ -150,6 +150,7 @@ if(NOT BUILD_SHARED_LIBS) ...@@ -150,6 +150,7 @@ if(NOT BUILD_SHARED_LIBS)
endif() endif()
find_package(cifpp 2.0.0 REQUIRED) find_package(cifpp 2.0.0 REQUIRED)
find_package(Boost COMPONENTS date_time)
if(USE_RSRC) if(USE_RSRC)
add_custom_command(OUTPUT mkdssp_rsrc.obj add_custom_command(OUTPUT mkdssp_rsrc.obj
...@@ -166,7 +167,7 @@ add_executable(mkdssp ...@@ -166,7 +167,7 @@ add_executable(mkdssp
${DSSP_RESOURCE}) ${DSSP_RESOURCE})
target_include_directories(mkdssp PRIVATE cifpp::cifpp ${CMAKE_SOURCE_DIR}/include ${cifpp_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${CMAKE_BINARY_DIR}) target_include_directories(mkdssp PRIVATE cifpp::cifpp ${CMAKE_SOURCE_DIR}/include ${cifpp_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${CMAKE_BINARY_DIR})
target_link_libraries(mkdssp PRIVATE cifpp::cifpp ${CMAKE_THREAD_LIBS_INIT}) target_link_libraries(mkdssp PRIVATE cifpp::cifpp Boost::date_time ${CMAKE_THREAD_LIBS_INIT})
install(TARGETS ${PROJECT_NAME} install(TARGETS ${PROJECT_NAME}
RUNTIME DESTINATION ${BIN_INSTALL_DIR} RUNTIME DESTINATION ${BIN_INSTALL_DIR}
...@@ -193,7 +194,7 @@ target_include_directories(unit-test PRIVATE ...@@ -193,7 +194,7 @@ target_include_directories(unit-test PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/include ${CMAKE_CURRENT_SOURCE_DIR}/include
) )
target_link_libraries(unit-test Threads::Threads cifpp::cifpp) target_link_libraries(unit-test Threads::Threads cifpp::cifpp Boost::date_time)
if(MSVC) if(MSVC)
# Specify unwind semantics so that MSVC knowns how to handle exceptions # Specify unwind semantics so that MSVC knowns how to handle exceptions
...@@ -217,4 +218,4 @@ if(DSSP_BUILD_INSTALLER) ...@@ -217,4 +218,4 @@ if(DSSP_BUILD_INSTALLER)
# configuration done, include CPack # configuration done, include CPack
include(CPack) include(CPack)
endif() endif()
\ No newline at end of file
Version 4.0.3
- Fixed makefile
Version 4.0.2 Version 4.0.2
- Dropped support for reading bzip2 files directly. gzipped is still supported - Dropped support for reading bzip2 files directly. gzipped is still supported
......
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