diff options
| author | Thomas White <taw@physics.org> | 2021-04-27 13:12:09 +0200 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2021-04-27 13:18:32 +0200 |
| commit | c66781ed4d8beb611a1155be540cffb3df7ce146 (patch) | |
| tree | 2e1a724e711ed1446bde872bab9761be66fbf7a2 /libcrystfel/CMakeLists.txt | |
| parent | 7424f7d7190d221e5dedcdeadc2809ec8166292e (diff) | |
Rename libcrystfel's config.h to libcrystfel-config.h
This removes the big potential for confusion, which has happened several
times (see e.g. 095cbebaf6). It also fixes in-tree builds with CMake
(but seriously, always use out-of-tree builds).
Fixes #2.
Diffstat (limited to 'libcrystfel/CMakeLists.txt')
| -rw-r--r-- | libcrystfel/CMakeLists.txt | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libcrystfel/CMakeLists.txt b/libcrystfel/CMakeLists.txt index 26ac2302..1fef33a4 100644 --- a/libcrystfel/CMakeLists.txt +++ b/libcrystfel/CMakeLists.txt @@ -27,7 +27,7 @@ set(CMAKE_REQUIRED_LIBRARIES "-lz") check_symbol_exists(gzbuffer "zlib.h" HAVE_GZBUFFER) unset(CMAKE_REQUIRED_LIBRARIES) -configure_file(config.h.cmake.in config.h) +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 @@ -140,7 +140,6 @@ set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "") target_include_directories(${PROJECT_NAME} INTERFACE ${PROJECT_SOURCE_DIR}/src) include_directories(${CMAKE_CURRENT_BINARY_DIR}) -add_definitions(-DHAVE_CONFIG_H) target_include_directories(${PROJECT_NAME} PRIVATE ${HDF5_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS}) target_link_libraries(${PROJECT_NAME} PRIVATE util ${HDF5_C_LIBRARIES} ${ZLIB_LIBRARIES} |