From 8bfaf26cea9a57c00c10101c47ae19e56c8fc770 Mon Sep 17 00:00:00 2001 From: Gianni Date: Wed, 26 Jun 2019 12:01:18 +0100 Subject: [PATCH] Added LAPACK and Boost libraries to CMake targets. --- CMakeLists.txt | 9 +++++---- test/CMakeLists.txt | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d680ff05..962fce4c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,8 +1,8 @@ # CHAP - The Channel Annotation Package -# -# Copyright (c) 2016 - 2018 Gianni Klesse, Shanlin Rao, Mark S. P. Sansom, and +# +# Copyright (c) 2016 - 2018 Gianni Klesse, Shanlin Rao, Mark S. P. Sansom, and # Stephen J. Tucker -# +# # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights @@ -155,7 +155,9 @@ list(APPEND SRC_FILES "${CMAKE_CURRENT_BINARY_DIR}/config/config.cpp") add_executable(chap ${SRC_FILES}) target_include_directories(chap PUBLIC ${CHAP_SOURCE_DIR}/include) target_link_libraries(chap ${LAPACKE_LIBRARIES}) +target_include_directories(chap PUBLIC ${LAPACKE_INCLUDE_DIRS}) target_link_libraries(chap ${BOOST_LIBRARIES}) +target_include_directories(chap PUBLIC ${Boost_INCLUDE_DIRS}) target_link_libraries(chap ${GROMACS_LIBRARIES}) target_link_libraries(chap ${GTEST_LIBRARY}) @@ -180,4 +182,3 @@ install(TARGETS chap DESTINATION ${CMAKE_INSTALL_PREFIX}/chap/bin) # also install data and scripts: install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/share DESTINATION ${CMAKE_INSTALL_PREFIX}/chap) install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/scripts DESTINATION ${CMAKE_INSTALL_PREFIX}/chap USE_SOURCE_PERMISSIONS) - diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 31d397bf..2c531416 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -1,8 +1,8 @@ # CHAP - The Channel Annotation Package -# -# Copyright (c) 2016 - 2018 Gianni Klesse, Shanlin Rao, Mark S. P. Sansom, and +# +# Copyright (c) 2016 - 2018 Gianni Klesse, Shanlin Rao, Mark S. P. Sansom, and # Stephen J. Tucker -# +# # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights @@ -43,12 +43,13 @@ add_executable(runAllTests ${TEST_SRC_FILES} ${SRC_FILES}) target_include_directories(runAllTests PUBLIC ${CHAP_SOURCE_DIR}/include) target_link_libraries(runAllTests ${GROMACS_LIBRARIES}) target_link_libraries(runAllTests ${LAPACKE_LIBRARIES}) +target_include_directories(chap PUBLIC ${LAPACKE_INCLUDE_DIRS}) target_link_libraries(runAllTests ${LAPACK_LIBRARIES}) target_link_libraries(runAllTests ${BLAS_LIBRARIES}) target_link_libraries(runAllTests ${GTEST_LIBRARY}) target_link_libraries(runAllTests ${CMAKE_THREAD_LIBS_INIT}) +target_include_directories(runAllTests PUBLIC ${Boost_INCLUDE_DIRS}) # make ctest aware of test executable: # (if the color option is not set some test fail) add_test(runAllTests runAllTests --gtest_color=yes) -