diff --git a/CMakeLists.txt b/CMakeLists.txt index 6a877358a..1255b1ba8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,14 +1,18 @@ cmake_minimum_required(VERSION 2.8) set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake") + find_package(Qt4) find_package(Qwt 6) find_package(CBF) find_package(Doxygen) +find_package(HDF5 1.10) + +set (REST OFF) + add_subdirectory(slsDetectorSoftware) add_subdirectory(slsReceiverSoftware) -add_subdirectory(slsImageReconstruction) if (QT4_FOUND AND QWT_FOUND) add_subdirectory(slsDetectorGui) endif() @@ -19,3 +23,7 @@ if (DEFINED ENV{ROOTSYS}) add_subdirectory(calibrationWizards) endif() endif() + + + + diff --git a/Makefile.include b/Makefile.include index 0212697fc..e90fd9bf2 100755 --- a/Makefile.include +++ b/Makefile.include @@ -24,7 +24,7 @@ endif # HDF5 code: in this case, you need HDF5 libraries ############################################################## -HDF5 = no +HDF5 = yes HDF5_DIR = /opt/hdf5v1.10.0 ifeq ($(HDF5),yes)