mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2025-04-24 15:20:02 +02:00
Merge branch 'cmakefix' into 3.0-rc
This commit is contained in:
commit
699cce713b
@ -1,12 +1,11 @@
|
|||||||
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)
|
||||||
find_package(Doxygen)
|
find_package(Doxygen)
|
||||||
find_package(HDF5 1.10)
|
find_package(HDF5 1.10 COMPONENTS CXX)
|
||||||
|
|
||||||
set (REST OFF)
|
set (REST OFF)
|
||||||
set (CALIBRATE OFF)
|
set (CALIBRATE OFF)
|
||||||
@ -27,7 +26,3 @@ if (CALIBRATE)
|
|||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
endif(CALIBRATE)
|
endif(CALIBRATE)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -36,6 +36,10 @@ Use cmake to create out-of-source builds, by creating an build folder parallel t
|
|||||||
$ make
|
$ 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
|
The libraries and executables will be found at `bin` directory
|
||||||
```
|
```
|
||||||
$ ls bin/
|
$ ls bin/
|
||||||
|
Loading…
x
Reference in New Issue
Block a user