diff --git a/integrationTests/CMakeLists.txt b/integrationTests/CMakeLists.txt index 871f62327..10d53fad2 100644 --- a/integrationTests/CMakeLists.txt +++ b/integrationTests/CMakeLists.txt @@ -7,13 +7,13 @@ include_directories( ${PROJECT_SOURCE_DIR}/catch ) - if(SLS_USE_TESTS) set(TEST_SOURCES src/test-slsDetector.cpp src/test.cpp ) add_executable(detector_test ${TEST_SOURCES}) + target_link_libraries(detector_test slsDetectorShared slsSupportLib @@ -24,40 +24,16 @@ if(SLS_USE_TESTS) RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin ) add_executable(a src/a.cpp) + target_link_libraries(a slsDetectorShared slsSupportLib pthread rt ) - set_target_properties(a PROPERTIES - RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin - ) + set_target_properties(a PROPERTIES + RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin + ) endif() - - -#option(SLS_USE_TESTS "Determines whether to build tests." OFF) -# if(SLS_USE_TESTS) -# # Prepare "Catch" library for other executables -# set(CATCH_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/catch) -# add_library(Catch INTERFACE) -# target_include_directories(Catch INTERFACE ${CATCH_INCLUDE_DIR}) - -# # Make test executable -# add_executable(tests ${BASE_TEST_SOURCES}) -# target_link_libraries(tests Catch) - -# set_target_properties(tests PROPERTIES -# RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin -# ) - -# #enable_testing() -# #add_test(NAME CommandLineClient COMMAND tests) - -# endif() - - -# install(TARGETS sls_client DESTINATION bin) - diff --git a/slsDetectorSoftware/CMakeLists.txt b/slsDetectorSoftware/CMakeLists.txt index 120b3644e..c59b43184 100644 --- a/slsDetectorSoftware/CMakeLists.txt +++ b/slsDetectorSoftware/CMakeLists.txt @@ -1,9 +1,8 @@ set(SOURCES - multiSlsDetector/multiSlsDetector.cpp - # sharedMemory/SharedMemory.cpp - slsDetector/slsDetectorUsers.cpp - slsDetector/slsDetectorCommand.cpp - slsDetector/slsDetector.cpp + src/multiSlsDetector.cpp + src/slsDetectorUsers.cpp + src/slsDetectorCommand.cpp + src/slsDetector.cpp ) set(HEADERS @@ -14,9 +13,7 @@ add_library(slsDetectorShared SHARED ${HEADERS} ) target_include_directories(slsDetectorShared PUBLIC - "$" - "$" - "$" + "$" "$" ) @@ -26,11 +23,11 @@ target_link_libraries(slsDetectorShared PUBLIC ) set(PUBLICHEADERS - sharedMemory/SharedMemory.h - slsDetector/slsDetector.h - slsDetector/slsDetectorUsers.h - slsDetector/detectorData.h - multiSlsDetector/multiSlsDetector.h + include/SharedMemory.h + include/slsDetector.h + include/slsDetectorUsers.h + include/detectorData.h + include/multiSlsDetector.h ) set_target_properties(slsDetectorShared PROPERTIES LIBRARY_OUTPUT_NAME SlsDetector @@ -38,7 +35,67 @@ set_target_properties(slsDetectorShared PROPERTIES PUBLIC_HEADER "${PUBLICHEADERS}" ) -add_subdirectory(slsDetectorClient) +# add_subdirectory(slsDetectorClient) + +add_executable(sls_detector_get + src/sls_detector_client.cpp +) +target_link_libraries(sls_detector_get + slsDetectorShared + slsSupportLib + pthread + ${ZeroMQ_LIBRARIES} + rt +) +set_target_properties(sls_detector_get PROPERTIES + RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin + COMPILE_DEFINITIONS GET=1 +) + +add_executable(sls_detector_put + src/sls_detector_client.cpp +) +target_link_libraries(sls_detector_put + slsDetectorShared + pthread + ${ZeroMQ_LIBRARIES} + rt +) +set_target_properties(sls_detector_put PROPERTIES + RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin + COMPILE_DEFINITIONS PUT=1 +) + +add_executable(sls_detector_acquire + src/sls_detector_client.cpp +) +target_link_libraries(sls_detector_acquire + slsDetectorShared + pthread + ${ZeroMQ_LIBRARIES} + rt +) +set_target_properties(sls_detector_acquire PROPERTIES + RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin + COMPILE_DEFINITIONS READOUT=1 +) + +add_executable(sls_detector_help + src/sls_detector_client.cpp +) +target_link_libraries(sls_detector_help + slsDetectorShared + pthread + ${ZeroMQ_LIBRARIES} + rt +) +set_target_properties(sls_detector_help PROPERTIES + RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin + COMPILE_DEFINITIONS HELP=1 +) + +install(TARGETS sls_detector_put sls_detector_get sls_detector_acquire sls_detector_help DESTINATION bin) + if(DOXYGEN_FOUND) add_custom_target(doc diff --git a/slsDetectorSoftware/sharedMemory/SharedMemory.h b/slsDetectorSoftware/include/SharedMemory.h similarity index 100% rename from slsDetectorSoftware/sharedMemory/SharedMemory.h rename to slsDetectorSoftware/include/SharedMemory.h diff --git a/slsDetectorSoftware/slsDetector/detectorData.h b/slsDetectorSoftware/include/detectorData.h similarity index 100% rename from slsDetectorSoftware/slsDetector/detectorData.h rename to slsDetectorSoftware/include/detectorData.h diff --git a/slsDetectorSoftware/slsDetector/gitInfoLib.h b/slsDetectorSoftware/include/gitInfoLib.h similarity index 100% rename from slsDetectorSoftware/slsDetector/gitInfoLib.h rename to slsDetectorSoftware/include/gitInfoLib.h diff --git a/slsDetectorSoftware/slsDetector/gitInfoLibTmp.h b/slsDetectorSoftware/include/gitInfoLibTmp.h similarity index 100% rename from slsDetectorSoftware/slsDetector/gitInfoLibTmp.h rename to slsDetectorSoftware/include/gitInfoLibTmp.h diff --git a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h b/slsDetectorSoftware/include/multiSlsDetector.h similarity index 100% rename from slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h rename to slsDetectorSoftware/include/multiSlsDetector.h diff --git a/slsDetectorSoftware/multiSlsDetector/multiSlsDetectorClient.h b/slsDetectorSoftware/include/multiSlsDetectorClient.h similarity index 100% rename from slsDetectorSoftware/multiSlsDetector/multiSlsDetectorClient.h rename to slsDetectorSoftware/include/multiSlsDetectorClient.h diff --git a/slsDetectorSoftware/slsDetector/slsDetector.h b/slsDetectorSoftware/include/slsDetector.h similarity index 100% rename from slsDetectorSoftware/slsDetector/slsDetector.h rename to slsDetectorSoftware/include/slsDetector.h diff --git a/slsDetectorSoftware/slsDetector/slsDetectorCommand.h b/slsDetectorSoftware/include/slsDetectorCommand.h similarity index 100% rename from slsDetectorSoftware/slsDetector/slsDetectorCommand.h rename to slsDetectorSoftware/include/slsDetectorCommand.h diff --git a/slsDetectorSoftware/slsDetector/slsDetectorUsers.h b/slsDetectorSoftware/include/slsDetectorUsers.h similarity index 100% rename from slsDetectorSoftware/slsDetector/slsDetectorUsers.h rename to slsDetectorSoftware/include/slsDetectorUsers.h diff --git a/slsDetectorSoftware/slsDetectorClient/CMakeLists.txt b/slsDetectorSoftware/slsDetectorClient/CMakeLists.txt deleted file mode 100644 index 7cd78795f..000000000 --- a/slsDetectorSoftware/slsDetectorClient/CMakeLists.txt +++ /dev/null @@ -1,62 +0,0 @@ -set(SOURCES - sls_detector_client.cpp -) - -add_executable(sls_detector_get - ${SOURCES} -) -target_link_libraries(sls_detector_get - slsDetectorShared - slsSupportLib - pthread - ${ZeroMQ_LIBRARIES} - rt -) -set_target_properties(sls_detector_get PROPERTIES - RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin - COMPILE_DEFINITIONS GET=1 -) - -add_executable(sls_detector_put - ${SOURCES} -) -target_link_libraries(sls_detector_put - slsDetectorShared - pthread - ${ZeroMQ_LIBRARIES} - rt -) -set_target_properties(sls_detector_put PROPERTIES - RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin - COMPILE_DEFINITIONS PUT=1 -) - -add_executable(sls_detector_acquire - ${SOURCES} -) -target_link_libraries(sls_detector_acquire - slsDetectorShared - pthread - ${ZeroMQ_LIBRARIES} - rt -) -set_target_properties(sls_detector_acquire PROPERTIES - RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin - COMPILE_DEFINITIONS READOUT=1 -) - -add_executable(sls_detector_help - ${SOURCES} -) -target_link_libraries(sls_detector_help - slsDetectorShared - pthread - ${ZeroMQ_LIBRARIES} - rt -) -set_target_properties(sls_detector_help PROPERTIES - RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin - COMPILE_DEFINITIONS HELP=1 -) - -install(TARGETS sls_detector_put sls_detector_get sls_detector_acquire sls_detector_help DESTINATION bin) diff --git a/slsDetectorSoftware/slsDetectorClient/Makefile.x04sa b/slsDetectorSoftware/slsDetectorClient/Makefile.x04sa deleted file mode 100644 index bb800f7c1..000000000 --- a/slsDetectorSoftware/slsDetectorClient/Makefile.x04sa +++ /dev/null @@ -1,54 +0,0 @@ -CFLAGS= -DC_ONLY -FLAGS=-DVERBOSE -INCLUDES= -I../slsSupportLib/include -I../slsDetectorSoftware/slsDetector -I ../slsDetectorSoftware/MySocketTCP -I../slsDetectorSoftware/usersFunctions -I../slsDetectorSoftware/multiSlsDetector -I../slsDetectorSoftware/slsDetectorAnalysis -LIBS= -L../slsDetectorSoftware/ -LDFLAG= -lSlsDetector -pthread - -EPICSFLAGS=-DEPICS -I/usr/local/epics/base/include/ -I /usr/local/epics/base/include/os/Linux/ -L /usr/local/epics/base/lib/SL5-x86/ -Wl,-R/usr/local/epics/base/lib/SL5-x86 -lca -lCom - -BIN=bin - -SRC_CLNT=sls_detector_client.cpp - -clients: sls_detector_put sls_detector_get sls_detector_acquire sls_detector_help - -all: lib clients - -lib: - cd ../slsDetectorSoftware && $(MAKE) lib - - - -sls_detector_put: $(SRC_CLNT) - mkdir -p $(BIN) - $(CXX) -o $(BIN)/sls_detector_put $(SRC_CLNT) $(FLAGS) $(INCLUDES) -DPUT $(LIBS) $(LDFLAG) $(EPICSFLAGS) - -sls_detector_get: $(SRC_CLNT) - mkdir -p $(BIN) - $(CXX) -o $(BIN)/sls_detector_get $(SRC_CLNT) $(FLAGS) $(INCLUDES) -DGET $(LIBS) $(LDFLAG) $(EPICSFLAGS) - -sls_detector_acquire: $(SRC_CLNT) - mkdir -p $(BIN) - $(CXX) -o $(BIN)/sls_detector_acquire $(SRC_CLNT) $(FLAGS) $(INCLUDES) -DREADOUT $(LIBS) $(LDFLAG) $(EPICSFLAGS) - -sls_detector_help: $(SRC_CLNT) - mkdir -p $(BIN) - $(CXX) -o $(BIN)/sls_detector_help $(SRC_CLNT) $(FLAGS) $(INCLUDES) -DHELP $(LIBS) $(LDFLAG) $(EPICSFLAGS) - - -clean: - rm -rf $(BIN)/sls_detector_* - - - - - -install_sls_detector: all - $(shell test -d $(DESTDIR) || mkdir -p $(DESTDIR)) - cp -P $(BIN)/sls_detector_put $(DESTDIR) - cp -P $(BIN)/sls_detector_get $(DESTDIR) - cp -P $(BIN)/sls_detector_acquire $(DESTDIR) - cp -P $(BIN)/sls_detector_help $(DESTDIR) - - - diff --git a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp b/slsDetectorSoftware/src/multiSlsDetector.cpp similarity index 100% rename from slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp rename to slsDetectorSoftware/src/multiSlsDetector.cpp diff --git a/slsDetectorSoftware/slsDetector/slsDetector.cpp b/slsDetectorSoftware/src/slsDetector.cpp similarity index 100% rename from slsDetectorSoftware/slsDetector/slsDetector.cpp rename to slsDetectorSoftware/src/slsDetector.cpp diff --git a/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp b/slsDetectorSoftware/src/slsDetectorCommand.cpp similarity index 100% rename from slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp rename to slsDetectorSoftware/src/slsDetectorCommand.cpp diff --git a/slsDetectorSoftware/slsDetector/slsDetectorUsers.cpp b/slsDetectorSoftware/src/slsDetectorUsers.cpp similarity index 100% rename from slsDetectorSoftware/slsDetector/slsDetectorUsers.cpp rename to slsDetectorSoftware/src/slsDetectorUsers.cpp diff --git a/slsDetectorSoftware/slsDetectorClient/sls_detector_client.cpp b/slsDetectorSoftware/src/sls_detector_client.cpp similarity index 100% rename from slsDetectorSoftware/slsDetectorClient/sls_detector_client.cpp rename to slsDetectorSoftware/src/sls_detector_client.cpp