mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2025-04-22 03:40:04 +02:00
sort of works, but needs simpler fix
This commit is contained in:
parent
e360077e09
commit
1d073b6897
@ -1,7 +1,7 @@
|
|||||||
cmake_minimum_required(VERSION 2.8)
|
cmake_minimum_required(VERSION 2.8)
|
||||||
set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
|
set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
|
||||||
|
|
||||||
|
set(HDF5_ROOT_DIR /opt/hdf5v1.10.0)
|
||||||
find_package(Qt4)
|
find_package(Qt4)
|
||||||
find_package(Qwt 6)
|
find_package(Qwt 6)
|
||||||
find_package(CBF)
|
find_package(CBF)
|
||||||
@ -9,6 +9,7 @@ find_package(Doxygen)
|
|||||||
find_package(HDF5 1.10)
|
find_package(HDF5 1.10)
|
||||||
|
|
||||||
set (REST OFF)
|
set (REST OFF)
|
||||||
|
set (CALIBRATE OFF)
|
||||||
|
|
||||||
|
|
||||||
add_subdirectory(slsDetectorSoftware)
|
add_subdirectory(slsDetectorSoftware)
|
||||||
@ -17,12 +18,15 @@ if (QT4_FOUND AND QWT_FOUND)
|
|||||||
add_subdirectory(slsDetectorGui)
|
add_subdirectory(slsDetectorGui)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if (DEFINED ENV{ROOTSYS})
|
|
||||||
find_package(ROOT)
|
if (CALIBRATE)
|
||||||
if (ROOT_FOUND)
|
if (DEFINED ENV{ROOTSYS})
|
||||||
add_subdirectory(calibrationWizards)
|
find_package(ROOT)
|
||||||
endif()
|
if (ROOT_FOUND)
|
||||||
endif()
|
add_subdirectory(calibrationWizards)
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
|
endif(CALIBRATE)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user