This commit is contained in:
Erik Frojdh 2019-02-12 15:06:15 +01:00
parent 3a2682ffe7
commit d7ce5fedfd
2 changed files with 16 additions and 17 deletions

View File

@ -6,9 +6,9 @@ mkdir $PREFIX/include/slsDetectorPackage
#Shared and static libraries #Shared and static libraries
cp build/bin/libSlsDetector.so $PREFIX/lib/. cp build/bin/libSlsDetector.so $PREFIX/lib/.
cp build/bin/libSlsDetector.a $PREFIX/lib/. # cp build/bin/libSlsDetector.a $PREFIX/lib/.
cp build/bin/libSlsReceiver.so $PREFIX/lib/. cp build/bin/libSlsReceiver.so $PREFIX/lib/.
cp build/bin/libSlsReceiver.a $PREFIX/lib/. # cp build/bin/libSlsReceiver.a $PREFIX/lib/.
#Binaries #Binaries
cp build/bin/sls_detector_acquire $PREFIX/bin/. cp build/bin/sls_detector_acquire $PREFIX/bin/.

View File

@ -23,18 +23,18 @@ set(HEADERS
) )
include_directories( include_directories(
commonFiles commonFiles
multiSlsDetector multiSlsDetector
sharedMemory sharedMemory
slsDetector slsDetector
slsDetectorUtils slsDetectorUtils
slsDetectorCommand slsDetectorCommand
slsDetectorAnalysis slsDetectorAnalysis
slsReceiverInterface slsReceiverInterface
threadFiles threadFiles
usersFunctions usersFunctions
../slsReceiverSoftware/include ../slsReceiverSoftware/include
../slsReceiverSoftware/MySocketTCP ../slsReceiverSoftware/MySocketTCP
) )
add_definitions( add_definitions(
@ -69,9 +69,8 @@ set(PUBLICHEADERS
multiSlsDetector/multiSlsDetector.h multiSlsDetector/multiSlsDetector.h
slsReceiverInterface/receiverInterface.h slsReceiverInterface/receiverInterface.h
../slsReceiverSoftware/include/sls_receiver_exceptions.h ../slsReceiverSoftware/include/sls_receiver_exceptions.h
include/slsReceiverUsers.h slsDetector/slsDetectorUsers.h
include/slsDetectorUsers.h ../slsReceiverSoftware/include/slsReceiverUsers.h
include/detectorData.h
) )
set_target_properties(slsDetectorShared PROPERTIES set_target_properties(slsDetectorShared PROPERTIES
LIBRARY_OUTPUT_NAME SlsDetector LIBRARY_OUTPUT_NAME SlsDetector