detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-05-12 07:30:03 +02:00
Code Issues Actions Packages Releases Activity

Merge branch 'cmake' into zmqdata

Browse Source
This commit is contained in:
Dhanya Maliakal 2016-09-05 10:43:13 +02:00
commit 258e671420
3 changed files with 53 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
slsReceiverSoftware/CMakeLists.txt Normal file
View File

@ -0,0 +1,44 @@
set(SOURCES
src/MySocketTCP.cpp
src/UDPInterface.cpp
src/UDPBaseImplementation.cpp
src/UDPStandardImplementation.cpp
src/slsReceiverTCPIPInterface.cpp
src/slsReceiver.cpp
src/slsReceiverUsers.cpp
src/utilities.cpp
)
include_directories(
include
../slsDetectorCalibration
)
add_library(slsReceiverStatic STATIC
${SOURCES}
${HEADERS}
)
set_target_properties(slsReceiverStatic PROPERTIES
ARCHIVE_OUTPUT_NAME SlsReceiver
ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin
)
add_library(slsReceiverShared SHARED
${SOURCES}
${HEADERS}
)
set_target_properties(slsReceiverShared PROPERTIES
LIBRARY_OUTPUT_NAME SlsReceiver
LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin
)
add_executable(slsReceiver
src/main.cpp
)
set_target_properties(slsReceiver PROPERTIES
RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin
)
target_link_libraries(slsReceiver
slsReceiverShared
pthread
)

10
slsReceiverSoftware/gitInfo.txt
View File

@ -1,9 +1,9 @@
Path: slsDetectorsPackage/slsReceiverSoftware Path: slsDetectorsPackage/slsReceiverSoftware
URL: origin git@git.psi.ch:sls_detectors_software/sls_receiver_software.git URL: origin git@git.psi.ch:sls_detectors_software/sls_receiver_software.git
Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_receiver_software.git Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_receiver_software.git
Repsitory UUID: a10bf5ae88d113a482dca646085abcb7a45dc52e Repsitory UUID: 10000196185a0991cd13457cd69966d79f860134
Revision: 249 Revision: 251
Branch: master Branch: developer
Last Changed Author: Dhanya_Maliakal Last Changed Author: Dhanya_Maliakal
Last Changed Rev: 249 Last Changed Rev: 251
Last Changed Date: 2016-08-04 17:19:31 +0200 Last Changed Date: 2016-08-12 13:48:30 +0200

8
slsReceiverSoftware/include/gitInfoReceiver.h
View File

@ -1,11 +1,11 @@
//#define SVNPATH "" //#define SVNPATH ""
#define SVNURL "git@git.psi.ch:sls_detectors_software/sls_receiver_software.git" #define SVNURL "git@git.psi.ch:sls_detectors_software/sls_receiver_software.git"
//#define SVNREPPATH "" //#define SVNREPPATH ""
#define SVNREPUUID "a10bf5ae88d113a482dca646085abcb7a45dc52e" #define SVNREPUUID "10000196185a0991cd13457cd69966d79f860134"
//#define SVNREV 0x249 //#define SVNREV 0x251
//#define SVNKIND "" //#define SVNKIND ""
//#define SVNSCHED "" //#define SVNSCHED ""
#define SVNAUTH "Dhanya_Maliakal" #define SVNAUTH "Dhanya_Maliakal"
#define SVNREV 0x249 #define SVNREV 0x251
#define SVNDATE 0x20160804 #define SVNDATE 0x20160812
// //