Commit e1009f6f authored by Martin Killenberg's avatar Martin Killenberg
Browse files

fixed last mentions of llrf in the CMakeLists.txt

parent 654b7f9a
......@@ -37,10 +37,10 @@ aux_source_directory(${CMAKE_SOURCE_DIR}/GpsdoDevice/src gpsdio_device_sources)
# add the test executable with all test source files
#aux_source_directory(${CMAKE_SOURCE_DIR}/test test_sources)
#add_executable(test_${PROJECT_NAME} ${server_sources} ${test_sources})
#set_target_properties(test_${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "${DOOCS_CXX_FLAGS} ${LLRFLibrary_CXX_FLAGS} ${mtca4u-VirtualLab_CXX_FLAGS} ${doocsllrfwrapper_CXX_FLAGS}")
#set_target_properties(test_${PROJECT_NAME} PROPERTIES LINK_FLAGS ${DOOCS_LINK_FLAGS} ${doocsllrfwrapper_LINK_FLAGS})
#set_target_properties(test_${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "${DOOCS_CXX_FLAGS}")
#set_target_properties(test_${PROJECT_NAME} PROPERTIES LINK_FLAGS ${DOOCS_LINK_FLAGS})
#target_link_libraries(test_${PROJECT_NAME} ${doocs-server-test-helper_LIBRARIES} ${DOOCS_LIBRARIES}
# ${Boost_LIBRARIES} ${doocsllrfwrapper_LIBRARIES} ${LLRFLibrary_LIBRARIES} ${mtca4u-VirtualLab_LIBRARIES} ${HDF5_LIBRARIES})
# ${Boost_LIBRARIES} )
#add_test(test_${PROJECT_NAME} test_${PROJECT_NAME})
# copy config file
......@@ -66,7 +66,7 @@ aux_source_directory(${CMAKE_SOURCE_DIR}/GpsdoDevice/src gpsdio_device_sources)
#include_directories(${PROJECT_BINARY_DIR}/version)
# copy config file for running in virtuallab environment
#FILE( COPY ${CMAKE_SOURCE_DIR}/test/llrfctrlhzdr.conf DESTINATION ${PROJECT_BINARY_DIR})
#FILE( COPY ${CMAKE_SOURCE_DIR}/test/gpsdo.conf DESTINATION ${PROJECT_BINARY_DIR})
# keep the rpath in the installed executable to correctly find the dependencies
SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
......@@ -77,8 +77,6 @@ add_library(GpsdoDevice ${gpsdio_device_sources})
add_executable(${PROJECT_NAME} ${server_sources} )
set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS " ${DOOCS_CXX_FLAGS}")
set_target_properties(${PROJECT_NAME} PROPERTIES LINK_FLAGS ${DOOCS_LINK_FLAGS})
#target_link_libraries(${PROJECT_NAME} ${doocs-server-test-helper_LIBRARIES} ${DOOCS_LIBRARIES} ${Boost_LIBRARIES}
# ${doocsllrfwrapper_LIBRARIES} ${LLRFLibrary_LIBRARIES} ${mtca4u-VirtualLab_LIBRARIES} ${HDF5_LIBRARIES})
target_link_libraries(${PROJECT_NAME} ${DOOCS_LIBRARIES} ${Boost_LIBRARIES} GpsdoDevice)
# Copy the RPC_LIBNO
......@@ -88,8 +86,8 @@ FILE(COPY ${CMAKE_SOURCE_DIR}/doocs_gpsdo_server/RPC_LIBNO DESTINATION ${PROJECT
if("${CMAKE_INSTALL_PREFIX}" STREQUAL "/export/doocs/server")
install(PROGRAMS ${PROJECT_BINARY_DIR}/${PROJECT_NAME} DESTINATION gpsdo_server RENAME gpsdo_server.dist)
install(FILES doocs_gpsdo_server/RPC_LIBNO DESTINATION gpsdo_server)
install(FILES doocs_gpsdo_server/gpsdo_CONF.TEMPLATE DESTINATION llrfCtrl_server)
install(FILES doocs_gpsdo_server/gpsdo_CONF.TEMPLATE DESTINATION gpsdo_server)
else()
install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin)
# the RPC_LIBNO and llrfCtrl_CONF.TEMPLATE files are not installed when not following the DOOCS directory scheme
# the RPC_LIBNO and gpsdo_CONF.TEMPLATE files are not installed when not following the DOOCS directory scheme
endif()
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment