diff --git a/.gitattributes b/.gitattributes index 22eff106e944c7be6d2f67220cb57b7998175c12..f62c0fc721e303b9db4ab09c66e9fda3dc599a7d 100644 --- a/.gitattributes +++ b/.gitattributes @@ -43,6 +43,8 @@ 3rdparty/zoid/daemon.2cores/init.c.signal -text 3rdparty/zoid/daemon.2cores/zoid.map -text Appl/ApplCommon/bootstrap -text +Appl/CEP/CMakeLists.txt -text +Appl/CEP/CS1/CMakeLists.txt -text Appl/CEP/CS1/CS1_BandpassCorrector/CS1_BandpassCorrector.spec.in -text Appl/CEP/CS1/CS1_BandpassCorrector/bootstrap -text Appl/CEP/CS1/CS1_BandpassCorrector/test/CS1_Flagger.parset -text @@ -80,6 +82,8 @@ Appl/CEP/CS1/CS1_Flagger2/test/Makefile.am -text Appl/CEP/CS1/CS1_FrequencyFlagger/bootstrap -text Appl/CEP/CS1/CS1_FrequencyFlagger/test/CS1_FlaggerFlagger.parset -text Appl/CEP/CS1/CS1_FrequencyFlagger/test/Makefile.am -text +Appl/CEP/CS1/CS1_IONProc/CMakeLists.txt -text +Appl/CEP/CS1/CS1_IONProc/src/CMakeLists.txt -text Appl/CEP/CS1/CS1_Tools/bootstrap -text Appl/CEP/CS1/CS1_Tools/src/cexec-udp-copy -text Appl/CEP/CS1/CS1_pp_lib/CS1_IDPPP.spec.in -text @@ -98,6 +102,7 @@ Appl/CEP/CS1/CS1_pp_lib/src/Pipeline.cc -text Appl/CEP/CS1/CS1_pp_lib/src/PipelineProcessControl.cc -text Appl/CEP/CS1/CS1_pp_lib/test/CS1_IDPPP.parset -text Appl/CEP/CS1/CS1_pp_lib/test/Makefile.am -text +Appl/CMakeLists.txt -text Appl/USG/VHECR/bootstrap -text Appl/USG/VHECR/src/2008-01-24_TRIGGER.dat -text CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqNumericalDipoleBeam.h -text diff --git a/Appl/CEP/CMakeLists.txt b/Appl/CEP/CMakeLists.txt new file mode 100644 index 0000000000000000000000000000000000000000..fbde5f723a5877fd62f2b9b5b32853cbc6d51ece --- /dev/null +++ b/Appl/CEP/CMakeLists.txt @@ -0,0 +1,2 @@ + +add_subdirectory (CS1) diff --git a/Appl/CEP/CS1/CMakeLists.txt b/Appl/CEP/CS1/CMakeLists.txt new file mode 100644 index 0000000000000000000000000000000000000000..d3983517bf2740e2133e9baf9d24c096fdb1f673 --- /dev/null +++ b/Appl/CEP/CS1/CMakeLists.txt @@ -0,0 +1,18 @@ +add_subdirectory (CS1_BBS) +add_subdirectory (CS1_BGLProc) +add_subdirectory (CS1_BandpassCorrector) +add_subdirectory (CS1_BinningFlagger) +add_subdirectory (CS1_DFTImager) +add_subdirectory (CS1_DataSquasher) +add_subdirectory (CS1_Flagger) +add_subdirectory (CS1_Flagger2) +add_subdirectory (CS1_FrequencyFlagger) +add_subdirectory (CS1_Generator) +add_subdirectory (CS1_IONProc) +add_subdirectory (CS1_Imager) +add_subdirectory (CS1_Interface) +add_subdirectory (CS1_Run) +add_subdirectory (CS1_SPWCombine) +add_subdirectory (CS1_Storage) +add_subdirectory (CS1_Tools) +add_subdirectory (CS1_pp_lib) diff --git a/Appl/CEP/CS1/CS1_IONProc/CMakeLists.txt b/Appl/CEP/CS1/CS1_IONProc/CMakeLists.txt new file mode 100644 index 0000000000000000000000000000000000000000..f50d3102624a65c44bbc9cb9afa20124a3bfe173 --- /dev/null +++ b/Appl/CEP/CS1/CS1_IONProc/CMakeLists.txt @@ -0,0 +1,2 @@ + +add_subdirectory (src) diff --git a/Appl/CEP/CS1/CS1_IONProc/src/CMakeLists.txt b/Appl/CEP/CS1/CS1_IONProc/src/CMakeLists.txt new file mode 100644 index 0000000000000000000000000000000000000000..62cbb63d5f20e2dbd9100b2f1e219ecff8efc7a4 --- /dev/null +++ b/Appl/CEP/CS1/CS1_IONProc/src/CMakeLists.txt @@ -0,0 +1,19 @@ + +set (liblofar_impl_SOURCES + BeamletBuffer.cc + BGL_Personality.cc + CS1_ION_main.cc + Connector.cc + InputThread.cc + ION_Allocator.cc + ReaderWriterSynchronization.cc + InputSection.cc + WH_DelayCompensation.cc + AH_ION_Gather.cc + WH_ION_Gather.cc + TH_ZoidServer.cc +# Package__Version.cc + ) + +add_library (lofar_impl ${liblofar_impl_SOURCES}) + diff --git a/Appl/CMakeLists.txt b/Appl/CMakeLists.txt new file mode 100644 index 0000000000000000000000000000000000000000..93b76900cb9c2774317440c10d954751a7364635 --- /dev/null +++ b/Appl/CMakeLists.txt @@ -0,0 +1,158 @@ + +## ------------------------------------------------------------------------------ +## Project characteristics + +project (Appl) + +cmake_minimum_required (VERSION 2.5) + +## ------------------------------------------------------------------------------ +## Set CMAKE_MODULE_PATH to load custom CMake modules + +find_path (USG_ROOT cmake/CMakeSettings.cmake + PATHS + ${Appl_SOURCE_DIR} + ${Appl_SOURCE_DIR}/.. + ${Appl_SOURCE_DIR}/../.. + ${Appl_SOURCE_DIR}/../../.. + $ENV{LOFARSOFT} + ) + +if (USG_ROOT) + include (${USG_ROOT}/cmake/CMakeSettings.cmake) +else (USG_ROOT) + message (FATAL_ERROR "Unable to locate additional CMake scripts!") +endif (USG_ROOT) + +## ------------------------------------------------------------------------------ +## Additional CMake modules + +include (CheckIncludeFiles) +include (CheckLibraryExists) +#include (CheckFunctionExists) +include (CheckTypeSize) +include (CTest) +enable_testing() + +## ------------------------------------------------------------------------------ +## Check system libraries + +check_include_files (sys/socket.h HAVE_SYS_SOCKET_H ) +check_include_files (sys/types.h HAVE_SYS_TYPES_H ) +check_include_files (unistd.h HAVE_UNISTD_H ) +check_include_files (stdarg.h HAVE_STDARG_H ) +check_include_files (time.h HAVE_TIME_H ) +check_include_files (stdio.h HAVE_STDIO_H ) +check_include_files (netinet/in.h HAVE_NETINET_IN_H ) + +if (HAVE_SYS_TYPES_H) + check_type_size ("uint" HAVE_UINT) + if (HAVE_UINT) + add_definitions (-DHAVE_UINT) + endif (HAVE_UINT) + ## + check_type_size ("long" HAVE_LONG) + if (HAVE_LONG) + add_definitions (-DHAVE_LONG) + endif (HAVE_LONG) + ## + check_type_size ("long long" HAVE_LONGLONG) + if (HAVE_LONGLONG) + add_definitions (-DHAVE_LONGLONG) + endif (HAVE_LONGLONG) + ## + check_type_size ("ushort" HAVE_USHORT) + if (HAVE_USHORT) + add_definitions (-DHAVE_USHORT) + endif (HAVE_USHORT) +else (HAVE_SYS_TYPES_H) + message (STATUS "Unable to find sys/types.h") +endif (HAVE_SYS_TYPES_H) + +## ------------------------------------------------------------------------------ +## Check for required tools + +find_program ( bison_bin bison ) +find_program ( flex_bin flex ) +find_program ( yacc_bin yacc ) + +## ------------------------------------------------------------------------------ +## Search for external libraries + +## Boost++ + +include (FindBoost) + +if (BOOST_INCLUDES) + include_directories (${BOOST_INCLUDES}) + add_definitions (-DHAVE_BOOST) +endif (BOOST_INCLUDES) + +## casacore + +include (FindCASACORE) + +if (CASACORE_INCLUDES) + include_directories (${CASACORE_INCLUDES}) + add_definitions (-DHAVE_AIPSPP) +endif (CASACORE_INCLUDES) + + +## Commonly used configuration files + +set (Appl_config ${Appl_BINARY_DIR}/lofar_config.h) + +file (WRITE ${Appl_config} "/* lofar_config.h -- Generated by CMake. */\n\n") + +include_directories (${Appl_BINARY_DIR}) + +## ------------------------------------------------------------------------------ +## Module header files + +include_directories ( + ## header files collection in "include" + ${Appl_SOURCE_DIR}/ApplCommon/include + ${Appl_SOURCE_DIR}/CEP/CS1/CS1_BandpassCorrector/include + ${Appl_SOURCE_DIR}/CEP/CS1/CS1_BBS/include + ${Appl_SOURCE_DIR}/CEP/CS1/CS1_BinningFlagger/include + ${Appl_SOURCE_DIR}/CEP/CS1/CS1_DataSquasher/include + ${Appl_SOURCE_DIR}/CEP/CS1/CS1_DFTImager/include + ${Appl_SOURCE_DIR}/CEP/CS1/CS1_Flagger/include + ${Appl_SOURCE_DIR}/CEP/CS1/CS1_Flagger2/include + ${Appl_SOURCE_DIR}/CEP/CS1/CS1_FrequencyFlagger/include + ${Appl_SOURCE_DIR}/CEP/CS1/CS1_Generator/include + ${Appl_SOURCE_DIR}/CEP/CS1/CS1_Imager/include + ${Appl_SOURCE_DIR}/CEP/CS1/CS1_Interface/include + ${Appl_SOURCE_DIR}/CEP/CS1/CS1_pp_lib/include + ${Appl_SOURCE_DIR}/CEP/CS1/CS1_SPWCombine/include + ${Appl_SOURCE_DIR}/CEP/CS1/CS1_Storage/include + ${Appl_SOURCE_DIR}/CEP/CS1/CS1_Tools/include + ## header files collected in "src" + ${Appl_SOURCE_DIR}/CEP/CS1/CS1_IONProc/src + ## header files from other modules + ${Appl_SOURCE_DIR}/../CEP/tinyCEP/include + ${Appl_SOURCE_DIR}/../CEP/CEPFrame/include + ${Appl_SOURCE_DIR}/../LCS/Common/include + ${Appl_SOURCE_DIR}/../LCS/Blob/include + ${Appl_SOURCE_DIR}/../LCS/Transport/include + ${Appl_SOURCE_DIR}/../LCS/ACC/PLC/include + ${Appl_SOURCE_DIR}/../LCS/ACC/APS/include + ${Appl_SOURCE_DIR}/../LCS/AMC/AMCBase/include + ) + +## ------------------------------------------------------------------------------ +## Directories to be included in the build + +add_subdirectory (CEP) +add_subdirectory (USG) + + +## ============================================================================== +## +## Feedback on configuration settings +## +## ============================================================================== + +message (STATUS "Flex = ${flex_bin}") +message (STATUS "Bison = ${bison_bin}") +message (STATUS "Yacc = ${yacc_bin}")