From 1995ba5ada88e3c1949eaf245c5e8e60dff5a3cc Mon Sep 17 00:00:00 2001 From: Thomas White Date: Wed, 22 Feb 2023 11:53:04 +0100 Subject: Remove CMake build files It's already far behind parity with Meson, and getting worse. --- libcrystfel/CMakeLists.txt | 176 ------------------------- libcrystfel/crystfel.pc.in | 11 -- libcrystfel/doc/coding.md | 2 +- libcrystfel/libcrystfel-config.h.cmake.in | 19 --- libcrystfel/src/libcrystfel-version.c.cmake.in | 4 - 5 files changed, 1 insertion(+), 211 deletions(-) delete mode 100644 libcrystfel/CMakeLists.txt delete mode 100644 libcrystfel/crystfel.pc.in delete mode 100644 libcrystfel/libcrystfel-config.h.cmake.in delete mode 100644 libcrystfel/src/libcrystfel-version.c.cmake.in (limited to 'libcrystfel') diff --git a/libcrystfel/CMakeLists.txt b/libcrystfel/CMakeLists.txt deleted file mode 100644 index ea475637..00000000 --- a/libcrystfel/CMakeLists.txt +++ /dev/null @@ -1,176 +0,0 @@ -project(libcrystfel VERSION ${CRYSTFEL_SHORT_VERSION} LANGUAGES C) - -pkg_check_modules(XGANDALF xgandalf) -pkg_check_modules(PINKINDEXER pinkIndexer) -pkg_check_modules(FDIP fdip) -find_package(ZLIB) -find_package(FLEX REQUIRED) -find_package(BISON REQUIRED) -pkg_check_modules(MSGPACK msgpack) -pkg_check_modules(FFTW fftw3) -pkg_check_modules(LIBCCP4 libccp4c) - -configure_file(src/libcrystfel-version.c.cmake.in libcrystfel-version.c) - -set(HAVE_FFTW ${FFTW_FOUND}) -set(HAVE_XGANDALF ${XGANDALF_FOUND}) -set(HAVE_PINKINDEXER ${PINKINDEXER_FOUND}) -set(HAVE_FDIP ${FDIP_FOUND}) -set(HAVE_MSGPACK ${MSGPACK_FOUND}) -set(HAVE_LIBCCP4 ${LIBCCP4_FOUND}) -set(HAVE_ZLIB ${ZLIB_FOUND}) -set(HAVE_SEEDEE 0) - -# Recent enough version of zlib? -set(CMAKE_REQUIRED_LIBRARIES "-lz") -check_symbol_exists(gzbuffer "zlib.h" HAVE_GZBUFFER) -unset(CMAKE_REQUIRED_LIBRARIES) - -configure_file(libcrystfel-config.h.cmake.in libcrystfel-config.h) - -bison_target(symopp src/symop.y ${CMAKE_CURRENT_BINARY_DIR}/symop-parse.c COMPILE_FLAGS --report=all) -flex_target(symopl src/symop.l ${CMAKE_CURRENT_BINARY_DIR}/symop-lex.c - DEFINES_FILE ${CMAKE_CURRENT_BINARY_DIR}/symop-lex.h) -add_flex_bison_dependency(symopl symopp) -include_directories(${PROJECT_SOURCE_DIR}/src) - -set(LIBCRYSTFEL_SOURCES - src/reflist.c - src/utils.c - src/cell.c - src/thread-pool.c - src/image.c - src/geometry.c - src/peakfinder8.c - src/symmetry.c - src/stream.c - src/peaks.c - src/reflist-utils.c - src/filters.c - src/index.c - src/cell-utils.c - src/integer_matrix.c - src/crystal.c - src/integration.c - src/predict-refine.c - src/peakfinder8.c - src/rational.c - src/spectrum.c - src/datatemplate.c - src/colscale.c - src/detgeom.c - src/image-cbf.c - src/image-hdf5.c - src/fom.c - src/image-msgpack.c - src/image-seedee.c - src/profile.c - ${BISON_symopp_OUTPUTS} - ${FLEX_symopl_OUTPUTS} - src/indexers/dirax.c - src/indexers/mosflm.c - src/indexers/xds.c - src/indexers/felix.c - src/indexers/taketwo.c - src/indexers/asdf.c - src/indexers/xgandalf.c - src/indexers/pinkindexer.c - src/indexers/fromfile.c -) - -set(LIBCRYSTFEL_HEADERS - src/reflist.h - src/symmetry.h - src/cell.h - src/reflist-utils.h - src/thread-pool.h - src/utils.h - src/geometry.h - src/peaks.h - src/stream.h - src/index.h - src/image.h - src/filters.h - src/cell-utils.h - src/integer_matrix.h - src/crystal.h - src/predict-refine.h - src/integration.h - src/rational.h - src/spectrum.h - src/datatemplate.h - src/colscale.h - src/detgeom.h - src/fom.h - src/profile.h -) - -add_library(${PROJECT_NAME} SHARED - ${LIBCRYSTFEL_SOURCES} - ${CMAKE_CURRENT_BINARY_DIR}/libcrystfel-version.c - ${LIBCRYSTFEL_HEADERS}) - -set_target_properties(${PROJECT_NAME} PROPERTIES INSTALL_RPATH_USE_LINK_PATH TRUE) -set_target_properties(${PROJECT_NAME} PROPERTIES BUILD_WITH_INSTALL_RPATH TRUE) -#set_target_properties(${PROJECT_NAME} PROPERTIES SKIP_BUILD_RPATH FALSE) - -list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_LIBDIR}" isSystemDir) -if("${isSystemDir}" STREQUAL "-1") - set_target_properties(${PROJECT_NAME} - PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_FULL_LIBDIR};${CMAKE_INSTALL_RPATH}") -endif("${isSystemDir}" STREQUAL "-1") - -set_target_properties(${PROJECT_NAME} PROPERTIES SOVERSION ${CRYSTFEL_API_VERSION}) -set_target_properties(${PROJECT_NAME} PROPERTIES VERSION ${CRYSTFEL_SHORT_VERSION}) - -# Suppress extra "lib" in front of "libcrystfel" -set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "") - -target_include_directories(${PROJECT_NAME} INTERFACE ${PROJECT_SOURCE_DIR}/src) -include_directories(${CMAKE_CURRENT_BINARY_DIR}) - -target_include_directories(${PROJECT_NAME} PRIVATE ${HDF5_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS}) -target_link_libraries(${PROJECT_NAME} PRIVATE util ${HDF5_C_LIBRARIES} ${HDF5_C_HL_LIBRARIES} - ${ZLIB_LIBRARIES} Threads::Threads GSL::gsl m) - -if (XGANDALF_FOUND) - target_include_directories(${PROJECT_NAME} PRIVATE ${XGANDALF_INCLUDE_DIRS}) - target_link_libraries(${PROJECT_NAME} PRIVATE ${XGANDALF_LINK_LIBRARIES}) -endif (XGANDALF_FOUND) - -if (FDIP_FOUND) - target_include_directories(${PROJECT_NAME} PRIVATE ${FDIP_INCLUDE_DIRS}) - target_link_libraries(${PROJECT_NAME} PRIVATE ${FDIP_LINK_LIBRARIES}) -endif (FDIP_FOUND) - -if (PINKINDEXER_FOUND) - target_include_directories(${PROJECT_NAME} PRIVATE ${PINKINDEXER_INCLUDE_DIRS}) - target_link_libraries(${PROJECT_NAME} PRIVATE ${PINKINDEXER_LINK_LIBRARIES}) -endif (PINKINDEXER_FOUND) - -if (FFTW_FOUND) - target_include_directories(${PROJECT_NAME} PRIVATE ${FFTW_INCLUDE_DIRS}) - target_link_libraries(${PROJECT_NAME} PRIVATE ${FFTW_LINK_LIBRARIES}) -endif (FFTW_FOUND) - -if (LIBCCP4_FOUND) - target_include_directories(${PROJECT_NAME} PRIVATE ${LIBCCP4_INCLUDES}) - target_link_libraries(${PROJECT_NAME} PRIVATE ${LIBCCP4_LIBRARIES}) -endif (LIBCCP4_FOUND) - -if (MSGPACK_FOUND) - target_include_directories(${PROJECT_NAME} PRIVATE ${MSGPACK_INCLUDES}) - target_link_libraries(${PROJECT_NAME} PRIVATE ${MSGPACK_LIBRARIES}) -endif (MSGPACK_FOUND) - -target_compile_options(${PROJECT_NAME} PRIVATE -Wall) -set_target_properties(${PROJECT_NAME} PROPERTIES PUBLIC_HEADER "${LIBCRYSTFEL_HEADERS}") - -install(TARGETS libcrystfel - PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/crystfel - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) - -# crystfel.pc -configure_file(crystfel.pc.in crystfel.pc) -install(FILES ${CMAKE_BINARY_DIR}/libcrystfel/crystfel.pc - DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) diff --git a/libcrystfel/crystfel.pc.in b/libcrystfel/crystfel.pc.in deleted file mode 100644 index 3a355f06..00000000 --- a/libcrystfel/crystfel.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -prefix=${CMAKE_INSTALL_PREFIX} -exec_prefix=${CMAKE_INSTALL_PREFIX} -libdir=${CMAKE_INSTALL_FULL_LIBDIR} -includedir=${CMAKE_INSTALL_FULL_INCLUDEDIR} - -Name: CrystFEL -Description: Useful routines for crystallography using a free-electron laser -Version: ${PROJECT_VERSION} -Cflags: -I${CMAKE_INSTALL_FULL_INCLUDEDIR} -Libs: -L${CMAKE_INSTALL_FULL_LIBDIR} -lcrystfel -Requires.private: gsl diff --git a/libcrystfel/doc/coding.md b/libcrystfel/doc/coding.md index 6e84e4fe..f83e5e50 100644 --- a/libcrystfel/doc/coding.md +++ b/libcrystfel/doc/coding.md @@ -15,7 +15,7 @@ to add your name to the 'AUTHORS' file in the top level folder, as well. The remainder of these rules apply to C code in libcrystfel and the core CrystFEL programs. There are currently no specific guidelines for Python, -Perl, shell script, CMake files or other parts of the codebase. +Perl, shell script, build scripts or other parts of the codebase. ### Indentation diff --git a/libcrystfel/libcrystfel-config.h.cmake.in b/libcrystfel/libcrystfel-config.h.cmake.in deleted file mode 100644 index 0b34950f..00000000 --- a/libcrystfel/libcrystfel-config.h.cmake.in +++ /dev/null @@ -1,19 +0,0 @@ -/* config.h for libcrystfel */ - -#cmakedefine HAVE_CLOCK_GETTIME -#cmakedefine HAVE_FFTW -#cmakedefine HAVE_XGANDALF -#cmakedefine HAVE_PINKINDEXER -#cmakedefine HAVE_FDIP -#cmakedefine HAVE_ZLIB -#cmakedefine HAVE_GZBUFFER -#cmakedefine HAVE_LIBCCP4 -#cmakedefine HAVE_MSGPACK -#cmakedefine HAVE_CLOCK_GETTIME -#cmakedefine HAVE_HDF5 -#cmakedefine HAVE_SEEDEE - -#cmakedefine HAVE_FORKPTY_PTY_H -#cmakedefine HAVE_FORKPTY_UTIL_H - -#define CRYSTFEL_VERSIONSTRING "${CRYSTFEL_VERSION}" diff --git a/libcrystfel/src/libcrystfel-version.c.cmake.in b/libcrystfel/src/libcrystfel-version.c.cmake.in deleted file mode 100644 index 513d7871..00000000 --- a/libcrystfel/src/libcrystfel-version.c.cmake.in +++ /dev/null @@ -1,4 +0,0 @@ -const char *libcrystfel_version_string() -{ - return "${CRYSTFEL_VERSION}"; -} -- cgit v1.2.3