From 53755d93445d7cfc49362f5c5c6dfa1770332ba2 Mon Sep 17 00:00:00 2001 From: Thomas White Date: Wed, 21 Mar 2018 16:54:46 +0100 Subject: Remove BUILD_EXPLORER and BUILD_HDFSEE options --- CMakeLists.txt | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 3db2ab58..eecfd882 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,9 +3,6 @@ project(crystfel) include(GNUInstallDirs) -option(BUILD_HDFSEE "Build hdfsee" ON) -option(BUILD_EXPLORER "Build the cell_explorer" ON) - # Set CMAKE_MODULE_PATH to assist cmake in finding our own package definitions set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/CMake") @@ -136,7 +133,7 @@ set_target_properties(pattern_sim PROPERTIES # Build Target # hdfsee -if(BUILD_HDFSEE AND GTK2_FOUND AND TIFF_FOUND) +if(GTK2_FOUND AND TIFF_FOUND) set(HDFSEE_SOURCES src/hdfsee.c @@ -172,13 +169,13 @@ if(BUILD_HDFSEE AND GTK2_FOUND AND TIFF_FOUND) RESOURCE DESTINATION share/crystfel ) -endif(BUILD_HDFSEE AND GTK2_FOUND AND TIFF_FOUND) +endif(GTK2_FOUND AND TIFF_FOUND) # ---------------------------------------------------------------------- # Build Target # cell_explorer -if(BUILD_EXPLORER AND GTK2_FOUND) +if (GTK2_FOUND) set(CELL_EXPLORER_SOURCES src/cell_explorer.c @@ -197,7 +194,7 @@ if(BUILD_EXPLORER AND GTK2_FOUND) LIBRARY DESTINATION lib ) -endif(BUILD_EXPLORER AND GTK2_FOUND) +endif(GTK2_FOUND) # ---------------------------------------------------------------------- # Build Target -- cgit v1.2.3