diff options
| author | Thomas White <taw@physics.org> | 2018-03-13 10:10:02 +0100 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2018-03-13 10:26:44 +0100 |
| commit | b75e8edb86ea416ddd0c3e944dddcfdb2be38fc9 (patch) | |
| tree | e1e200956ff126f4a6211a879e853b4b5b3dba0a | |
| parent | ea8e7bc35e5c09096c04f5c269451a330d59c49b (diff) | |
Move config.h stuff to main CMakeLists.txt
| -rw-r--r-- | CMake/config.cmake | 24 | ||||
| -rw-r--r-- | CMakeLists.txt | 24 |
2 files changed, 23 insertions, 25 deletions
diff --git a/CMake/config.cmake b/CMake/config.cmake deleted file mode 100644 index 53cd9b4c..00000000 --- a/CMake/config.cmake +++ /dev/null @@ -1,24 +0,0 @@ -include(CheckIncludeFile) -include(CheckLibraryExists) - -set(HAVE_CAIRO ${CAIRO_FOUND}) -set(HAVE_TIFF ${TIFF_FOUND}) -set(HAVE_GTK ${GTK2_FOUND}) -set(HAVE_FFTW ${FFTW_FOUND}) -set(HAVE_XGANDALF ${XGANDALF_FOUND}) -set(HAVE_FDIP ${FDIP_FOUND}) -set(HAVE_OPENCL ${OpenCL_FOUND}) -set(HAVE_CBFLIB ${CBF_FOUND}) - - -check_include_file(fcntl.h HAVE_FCNTL_H) -check_include_file(stdlib.h HAVE_STDLIB_H) -check_include_file(unistd.h HAVE_UNISTD_H) -if(OpenCL_FOUND) - check_include_file(CL/cl.h HAVE_CL_CL_H "-I${OpenCL_INCLUDE_DIRS}") -endif(OpenCL_FOUND) - -check_library_exists(rt clock_gettime "time.h" HAVE_CLOCK_GETTIME) - -configure_file(config.h.cmake.in config.h) -include_directories(${CMAKE_CURRENT_BINARY_DIR}) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4b1fd2c2..81cad49e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -55,7 +55,29 @@ add_subdirectory(libcrystfel) include(GetGitRevisionDescription) get_git_head_revision(GIT_REFSPEC GIT_SHA1) -include(config) +include(CheckIncludeFile) +include(CheckLibraryExists) + +set(HAVE_CAIRO ${CAIRO_FOUND}) +set(HAVE_TIFF ${TIFF_FOUND}) +set(HAVE_GTK ${GTK2_FOUND}) +set(HAVE_FFTW ${FFTW_FOUND}) +set(HAVE_XGANDALF ${XGANDALF_FOUND}) +set(HAVE_FDIP ${FDIP_FOUND}) +set(HAVE_OPENCL ${OpenCL_FOUND}) +set(HAVE_CBFLIB ${CBF_FOUND}) + +check_include_file(fcntl.h HAVE_FCNTL_H) +check_include_file(stdlib.h HAVE_STDLIB_H) +check_include_file(unistd.h HAVE_UNISTD_H) +if(OpenCL_FOUND) + check_include_file(CL/cl.h HAVE_CL_CL_H "-I${OpenCL_INCLUDE_DIRS}") +endif(OpenCL_FOUND) + +check_library_exists(rt clock_gettime "time.h" HAVE_CLOCK_GETTIME) + +configure_file(config.h.cmake.in config.h) +include_directories(${CMAKE_CURRENT_BINARY_DIR}) # ---------------------------------------------------------------------- # Build Target |