diff options
author | Thomas White <taw@physics.org> | 2018-06-19 11:08:07 +0200 |
---|---|---|
committer | Thomas White <taw@physics.org> | 2018-06-19 11:08:07 +0200 |
commit | ff3c0b995b704eef615b36119afdf04d862c6ead (patch) | |
tree | 0822690598ed91b52ebf65db45fd449e4310a0dc /libcrystfel | |
parent | b48a3d9aba6ce80ce8f0b2121e815cc20015532a (diff) |
Simplify pkg-config stuff
Use it directly (no fallbacks, at least not until someone really needs
it).
Also, use the full LDFLAGS instead of just LIBRARIES, because the former
also includes the link directories.
Diffstat (limited to 'libcrystfel')
-rw-r--r-- | libcrystfel/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libcrystfel/CMakeLists.txt b/libcrystfel/CMakeLists.txt index 2ca4e7e2..48690e3d 100644 --- a/libcrystfel/CMakeLists.txt +++ b/libcrystfel/CMakeLists.txt @@ -1,12 +1,12 @@ project(libcrystfel VERSION ${CRYSTFEL_SHORT_VERSION} LANGUAGES C) find_package(Curses) -find_package(FFTW) find_package(CBF) find_package(XGANDALF) find_package(PINKINDEXER) find_package(NBP) find_package(FDIP) +pkg_search_module(FFTW fftw3) set(HAVE_CURSES ${CURSES_FOUND}) set(HAVE_FFTW ${FFTW_FOUND}) @@ -148,7 +148,7 @@ endif (NBP_FOUND) if (FFTW_FOUND) target_include_directories(${PROJECT_NAME} PRIVATE ${FFTW_INCLUDES}) - target_link_libraries(${PROJECT_NAME} PRIVATE ${FFTW_LIBRARIES}) + target_link_libraries(${PROJECT_NAME} PRIVATE ${FFTW_LDFLAGS}) endif (FFTW_FOUND) if (CBF_FOUND) |