diff options
author | Thomas White <taw@physics.org> | 2020-08-05 16:13:47 +0200 |
---|---|---|
committer | Thomas White <taw@physics.org> | 2020-08-05 16:13:47 +0200 |
commit | d1c8ebaf76dfcba1f62e9245c5bd103bcf436aa2 (patch) | |
tree | 17d9d8ced385bc3e966f25c31d3a36fe4d80a88f | |
parent | 9adaa537b6070bfbe9a55317fcaf8c25dbafe3d6 (diff) |
Finish removing TIFF
-rw-r--r-- | CMakeLists.txt | 7 | ||||
-rw-r--r-- | meson.build | 8 |
2 files changed, 1 insertions, 14 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 7168ab43..c9b08e1c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,7 +14,6 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/CMake") find_package(HDF5 REQUIRED COMPONENTS C) find_package(Threads REQUIRED) find_package(GSL REQUIRED) -find_package(TIFF) find_package(OpenCL) find_package(PkgConfig) @@ -127,7 +126,6 @@ include(CheckIncludeFile) include(CheckLibraryExists) set(HAVE_CAIRO ${CAIRO_FOUND}) -set(HAVE_TIFF ${TIFF_FOUND}) set(HAVE_GTK ${GTK_FOUND}) set(HAVE_OPENCL ${OpenCL_FOUND}) set(HAVE_GDKPIXBUF ${GDKPIXBUF_FOUND}) @@ -366,11 +364,6 @@ list(APPEND CRYSTFEL_EXECUTABLES ambigator) # target_include_directories(geoptimiser PRIVATE ${GDK_INCLUDE_DIRS}) # target_link_libraries(geoptimiser ${GDK_LIBRARIES}) #endif (GDK_FOUND) -# -#if (TIFF_FOUND) -# target_include_directories(geoptimiser PRIVATE ${TIFF_INCLUDE_DIRS}) -# target_link_libraries(geoptimiser ${TIFF_LIBRARIES}) -#endif (TIFF_FOUND) # ---------------------------------------------------------------------- # whirligig diff --git a/meson.build b/meson.build index dcaa755b..10234df6 100644 --- a/meson.build +++ b/meson.build @@ -40,11 +40,6 @@ if fftwdep.found() conf_data.set10('HAVE_FFTW', 1) endif -tiffdep = dependency('libtiff-4', required : false) -if tiffdep.found() - conf_data.set10('HAVE_TIFF', 1) -endif - gtkdep = dependency('gtk+-3.0', required : false) if not gtkdep.found() gtkdep = dependency('gtk+-2.0', required : false) @@ -195,8 +190,7 @@ executable('make_pixelmap', # FIXME: restore #executable('geoptimiser', # ['src/geoptimiser.c', 'src/hdfsee-render.c', versionc], -# dependencies : [mdep, libcrystfeldep, gsldep, gdkpixbufdep, gdkdep, -# tiffdep], +# dependencies : [mdep, libcrystfeldep, gsldep, gdkpixbufdep, gdkdep], # install : true) # CrystFEL GUI |