diff options
| -rw-r--r-- | CMake/FindFDIP.cmake | 25 | ||||
| -rw-r--r-- | CMake/FindPINKINDEXER.cmake | 24 | ||||
| -rw-r--r-- | CMake/FindXGANDALF.cmake | 24 | ||||
| -rw-r--r-- | libcrystfel/CMakeLists.txt | 6 |
4 files changed, 3 insertions, 76 deletions
diff --git a/CMake/FindFDIP.cmake b/CMake/FindFDIP.cmake deleted file mode 100644 index 3306b483..00000000 --- a/CMake/FindFDIP.cmake +++ /dev/null @@ -1,25 +0,0 @@ -# - Find FDIP -# Find the native FDIP includes and library -# -# FDIP_INCLUDES - where to find streakFinder.h -# FDIP_LIBRARIES - List of libraries when using FDIP. -# FDIP_FOUND - True if FDIP found. - -if (FDIP_INCLUDES) - # Already in cache, be silent - set (FDIP_FIND_QUIETLY TRUE) -endif (FDIP_INCLUDES) - -find_path (FDIP_INCLUDES fastDiffractionImageProcessing/streakFinder.h - PATHS - ${CMAKE_INSTALL_PREFIX}/include) - -find_library (FDIP_LIBRARIES fastDiffractionImageProcessing - PATHS - ${CMAKE_INSTALL_PREFIX}/lib) - -# handle the QUIETLY and REQUIRED arguments and set FDIP_FOUND to TRUE if -# all listed variables are TRUE -include (FindPackageHandleStandardArgs) -set(FDIP_INCLUDES ${FDIP_INCLUDES};${FDIP_INCLUDES}/fastDiffractionImageProcessing) -find_package_handle_standard_args (FDIP DEFAULT_MSG FDIP_LIBRARIES FDIP_INCLUDES) diff --git a/CMake/FindPINKINDEXER.cmake b/CMake/FindPINKINDEXER.cmake deleted file mode 100644 index 3c217ff9..00000000 --- a/CMake/FindPINKINDEXER.cmake +++ /dev/null @@ -1,24 +0,0 @@ -# - Find PINKINDEXER -# Find the native PINKINDEXER includes and library -# -# PINKINDEXER_INCLUDES - where to find IndexerBase.h -# PINKINDEXER_LIBRARIES - List of libraries when using PINKINDEXER. -# PINKINDEXER_FOUND - True if PINKINDEXER found. - -if (PINKINDEXER_INCLUDES) - # Already in cache, be silent - set (PINKINDEXER_FIND_QUIETLY TRUE) -endif (PINKINDEXER_INCLUDES) - -find_path (PINKINDEXER_INCLUDES pinkIndexer/PinkIndexer.h - PATHS - ${CMAKE_INSTALL_PREFIX}/include) - -find_library (PINKINDEXER_LIBRARIES pinkIndexer - PATHS - ${CMAKE_INSTALL_PREFIX}/lib) - -# handle the QUIETLY and REQUIRED arguments and set PINKINDEXER_FOUND to TRUE if -# all listed variables are TRUE -include (FindPackageHandleStandardArgs) -find_package_handle_standard_args (PINKINDEXER DEFAULT_MSG PINKINDEXER_LIBRARIES PINKINDEXER_INCLUDES) diff --git a/CMake/FindXGANDALF.cmake b/CMake/FindXGANDALF.cmake deleted file mode 100644 index 8138da77..00000000 --- a/CMake/FindXGANDALF.cmake +++ /dev/null @@ -1,24 +0,0 @@ -# - Find XGANDALF -# Find the native XGANDALF includes and library -# -# XGANDALF_INCLUDES - where to find IndexerBase.h -# XGANDALF_LIBRARIES - List of libraries when using XGANDALF. -# XGANDALF_FOUND - True if XGANDALF found. - -if (XGANDALF_INCLUDES) - # Already in cache, be silent - set (XGANDALF_FIND_QUIETLY TRUE) -endif (XGANDALF_INCLUDES) - -find_path (XGANDALF_INCLUDES xgandalf/IndexerBase.h - PATHS - ${CMAKE_INSTALL_PREFIX}/include) - -find_library (XGANDALF_LIBRARIES xgandalf - PATHS - ${CMAKE_INSTALL_PREFIX}/lib) - -# handle the QUIETLY and REQUIRED arguments and set XGANDALF_FOUND to TRUE if -# all listed variables are TRUE -include (FindPackageHandleStandardArgs) -find_package_handle_standard_args (XGANDALF DEFAULT_MSG XGANDALF_LIBRARIES XGANDALF_INCLUDES) diff --git a/libcrystfel/CMakeLists.txt b/libcrystfel/CMakeLists.txt index aa1089f1..394156ed 100644 --- a/libcrystfel/CMakeLists.txt +++ b/libcrystfel/CMakeLists.txt @@ -1,9 +1,9 @@ project(libcrystfel VERSION ${CRYSTFEL_SHORT_VERSION} LANGUAGES C) find_package(Curses) -find_package(XGANDALF) -#find_package(PINKINDEXER) -find_package(FDIP) +pkg_check_modules (XGANDALF xgandalf) +pkg_check_modules (PINKINDEXER pinkIndexer) +pkg_check_modules (FDIP fdip) find_package(ZLIB REQUIRED) find_package(FLEX REQUIRED) find_package(BISON REQUIRED) |