detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-05-10 14:52:04 +02:00
Code Issues Actions Packages Releases Activity

merge from 3.0.1 compiling with rpath and updating detector binaries

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-11-13 12:32:08 +01:00
parent c0ec315b04 dedc00f1bd
commit e33ba2cd76
5 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+3
View File
@@ -15,6 +15,9 @@ endif (USE_HDF5)
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
set(CMAKE_INSTALL_RPATH "$ORIGIN")
set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
add_subdirectory(slsDetectorSoftware)
add_subdirectory(slsReceiverSoftware)
if (QT4_FOUND AND QWT_FOUND)
serverBin/eigerDetectorServer
+1 -1
View File
@@ -1 +1 @@
../slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv3.1.0.21.0
../slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv3.0.0.16.10
serverBin/gotthardDetectorServer
Symlink
+1
View File
@@ -0,0 +1 @@
../slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServerv3.0.0.6
serverBin/gotthardDetectorServerv3.0.0.5
-1
View File
@@ -1 +0,0 @@
../slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServerv3.0.0.5
serverBin/jungfrauDetectorServer
+1 -1
View File
@@ -1 +1 @@
../slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServerv3.0.0.10
../slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServerv3.0.0.6.1