Merge branch 'cmakefix' into 3.0-rc

This commit is contained in:
Dhanya Maliakal 2017-07-27 14:40:01 +02:00
commit 699cce713b
2 changed files with 11 additions and 12 deletions

View File

@ -1,12 +1,11 @@
cmake_minimum_required(VERSION 2.8)
set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
set(HDF5_ROOT_DIR /opt/hdf5v1.10.0)
find_package(Qt4)
find_package(Qwt 6)
find_package(CBF)
find_package(Doxygen)
find_package(HDF5 1.10)
find_package(HDF5 1.10 COMPONENTS CXX)
set (REST OFF)
set (CALIBRATE OFF)
@ -20,14 +19,10 @@ endif()
if (CALIBRATE)
if (DEFINED ENV{ROOTSYS})
find_package(ROOT)
if (ROOT_FOUND)
add_subdirectory(calibrationWizards)
endif()
endif()
if (DEFINED ENV{ROOTSYS})
find_package(ROOT)
if (ROOT_FOUND)
add_subdirectory(calibrationWizards)
endif()
endif()
endif(CALIBRATE)

View File

@ -36,6 +36,10 @@ Use cmake to create out-of-source builds, by creating an build folder parallel t
$ make
```
Use the following as an example to compile statically and using specific hdf5 folder
```
$ HDF5_ROOT=/opt/hdf5v1.10.0 cmake -DHDF5_USE_STATIC_LIBRARIES=TRUE ../slsDetectorsPackage
```
The libraries and executables will be found at `bin` directory
```
$ ls bin/