diff --git a/CMakeLists.txt b/CMakeLists.txt index 4ea1fb0662..f9c19cccb1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,7 +19,6 @@ cmake_minimum_required(VERSION 3.13) include(CMakeDependentOption) -include("${CMAKE_CURRENT_LIST_DIR}/thirdparty/cmake_functions/qt/qt_msvc_path.cmake") if (POLICY CMP0077) cmake_policy(SET CMP0077 NEW) # Prevent HDF5 from overwriting our output paths @@ -91,17 +90,20 @@ option(ECAL_NPCAP_SUPPORT "Enable the eCAL Npcap Receiver ( option(ECAL_USE_CLOCKLOCK_MUTEX "Use native mutex with monotonic clock (requires glibc >= 2.30)" OFF) # Set option regarding third party library builds +# option(ECAL_THIRDPARTY_BUILD_LIBSSH2 "Build libssh2 with eCAL" ON) +# option(ECAL_THIRDPARTY_BUILD_ZLIB "Build zlib with eCAL" ON) +option(ECAL_THIRDPARTY_BUILD_ASIO "Build asio with eCAL" ON) option(ECAL_THIRDPARTY_BUILD_CMAKE_FUNCTIONS "Build CMakeFunctions with eCAL" ON) -option(ECAL_THIRDPARTY_BUILD_SPDLOG "Build spdlog with eCAL" ON) -option(ECAL_THIRDPARTY_BUILD_TINYXML2 "Build tinyxml2 with eCAL" ON) option(ECAL_THIRDPARTY_BUILD_FINEFTP "Build fineFTP with eCAL" ON) -option(ECAL_THIRDPARTY_BUILD_TERMCOLOR "Build termcolor with eCAL" ON) -option(ECAL_THIRDPARTY_BUILD_TCP_PUBSUB "Build tcp_pubsub library with eCAL" ON) -option(ECAL_THIRDPARTY_BUILD_RECYCLE "Build steinwurf::recylce with eCAL" ON) option(ECAL_THIRDPARTY_BUILD_FTXUI "Build ftxui with eCAL" ON) -# option(ECAL_THIRDPARTY_BUILD_ZLIB "Build zlib with eCAL" ON) -# option(ECAL_THIRDPARTY_BUILD_LIBSSH2 "Build libssh2 with eCAL" ON) option(ECAL_THIRDPARTY_BUILD_GTEST "Build gtest with eCAL" OFF) +option(ECAL_THIRDPARTY_BUILD_RECYCLE "Build steinwurf::recylce with eCAL" ON) +option(ECAL_THIRDPARTY_BUILD_SPDLOG "Build spdlog with eCAL" ON) +option(ECAL_THIRDPARTY_BUILD_SIMPLEINI "Build simpleini with eCAL" ON) +option(ECAL_THIRDPARTY_BUILD_TCLAP "Build tclap library with eCAL" ON) +option(ECAL_THIRDPARTY_BUILD_TCP_PUBSUB "Build tcp_pubsub library with eCAL" ON) +option(ECAL_THIRDPARTY_BUILD_TERMCOLOR "Build termcolor with eCAL" ON) +option(ECAL_THIRDPARTY_BUILD_TINYXML2 "Build tinyxml2 with eCAL" ON) option(ECAL_THIRDPARTY_BUILD_UDPCAP "Build udpcap library with eCAL" OFF) if(WIN32) @@ -165,59 +167,35 @@ if(MSVC) endif() endif() -# -------------------------------------------------------- -# detect qt library -# -------------------------------------------------------- -if(MSVC) - if (HAS_QT5) - find_package(Qt5 COMPONENTS Core QUIET) - if (NOT "${Qt5_FOUND}") - autodetect_qt5_msvc_dir() - endif() - endif() -endif() - # This is a list of subprojects, that might be build with eCAL # according to how options ECAL_BUILD_ are set set(possible_subprojects - Protobuf - spdlog - tinyxml2 - fineftp - termcolor - recycle - tcp_pubsub - #libssh2 - #zlib zlibstatic + asio + CMakeFunctions CURL + fineftp + ftxui GTest HDF5 - CMakeFunctions + #libssh2 + Protobuf qwt - yaml-cpp - ftxui + recycle + simpleini + spdlog + tclap + tcp_pubsub + termcolor + tinyxml2 udpcap + yaml-cpp + #zlib zlibstatic ) # We should rename the option, but don't know how to do in in a # backwards compatible way set(ECAL_THIRDPARTY_BUILD_CMAKEFUNCTIONS ${ECAL_THIRDPARTY_BUILD_CMAKE_FUNCTIONS}) -# For each dependency, check if option to build was set or not -# if so append to `as_subproject` list -foreach (dep IN LISTS possible_subprojects) - string(TOUPPER ${dep} dep_upper) - if (ECAL_THIRDPARTY_BUILD_${dep_upper}) - list(APPEND as_subproject ${dep}) - endif () -endforeach() - -macro(find_package) - if(NOT "${ARGV0}" IN_LIST as_subproject) - _find_package(${ARGV}) - endif() -endmacro() - # if a package does need to be build, include the cmake file with build instructions foreach (dep IN LISTS possible_subprojects) string(TOUPPER ${dep} dep_upper) @@ -234,6 +212,19 @@ endif() find_package(CMakeFunctions REQUIRED) +# -------------------------------------------------------- +# detect qt library +# -------------------------------------------------------- +if(MSVC) + if (HAS_QT5) + find_package(Qt5 COMPONENTS Core QUIET) + if (NOT "${Qt5_FOUND}") + autodetect_qt5_msvc_dir() + endif() + endif() +endif() + + git_revision_information(DEFAULT ${ECAL_BUILD_VERSION}) set(eCAL_VERSION_MAJOR ${GIT_REVISION_MAJOR}) set(eCAL_VERSION_MINOR ${GIT_REVISION_MINOR}) @@ -281,9 +272,12 @@ set(eCAL_install_samples_dir ${CMAKE_INSTALL_BINDIR}) set(eCAL_install_samples_src_dir ${CMAKE_INSTALL_DATADIR}/ecal/samples/) set(eCAL_install_tests_dir ${CMAKE_INSTALL_BINDIR}) -set(eCAL_config_dir ${eCAL_BINARY_DIR}/cmake/) +set(eCAL_config_dir ${CMAKE_CURRENT_BINARY_DIR}/_generated/) set(eCAL_config ${eCAL_config_dir}/eCALConfig.cmake) set(eCAL_config_version ${eCAL_config_dir}/eCALConfigVersion.cmake) + +file(MAKE_DIRECTORY ${eCAL_config_dir}) + if(WIN32) set(eCAL_install_config_dir cfg) set(eCAL_install_doc_dir doc) @@ -570,20 +564,24 @@ message(STATUS "ECAL_INCLUDE_PY_SAMPLES : ${ECAL_INCLUDE_ message(STATUS "ECAL_INSTALL_SAMPLE_SOURCES : ${ECAL_INSTALL_SAMPLE_SOURCES}") message(STATUS "ECAL_JOIN_MULTICAST_TWICE : ${ECAL_JOIN_MULTICAST_TWICE}") message(STATUS "ECAL_NPCAP_SUPPORT : ${ECAL_NPCAP_SUPPORT}") +message(STATUS "ECAL_THIRDPARTY_BUILD_ASIO : ${ECAL_THIRDPARTY_BUILD_ASIO}") message(STATUS "ECAL_THIRDPARTY_BUILD_CMAKE_FUNCTIONS : ${ECAL_THIRDPARTY_BUILD_CMAKE_FUNCTIONS}") -message(STATUS "ECAL_THIRDPARTY_BUILD_SPDLOG : ${ECAL_THIRDPARTY_BUILD_SPDLOG}") -message(STATUS "ECAL_THIRDPARTY_BUILD_TINYXML2 : ${ECAL_THIRDPARTY_BUILD_TINYXML2}") +message(STATUS "ECAL_THIRDPARTY_BUILD_CURL : ${ECAL_THIRDPARTY_BUILD_CURL}") message(STATUS "ECAL_THIRDPARTY_BUILD_FINEFTP : ${ECAL_THIRDPARTY_BUILD_FINEFTP}") -message(STATUS "ECAL_THIRDPARTY_BUILD_TERMCOLOR : ${ECAL_THIRDPARTY_BUILD_TERMCOLOR}") -message(STATUS "ECAL_THIRDPARTY_BUILD_TCP_PUBSUB : ${ECAL_THIRDPARTY_BUILD_TCP_PUBSUB}") -message(STATUS "ECAL_THIRDPARTY_BUILD_RECYCLE : ${ECAL_THIRDPARTY_BUILD_RECYCLE}") message(STATUS "ECAL_THIRDPARTY_BUILD_FTXUI : ${ECAL_THIRDPARTY_BUILD_FTXUI}") message(STATUS "ECAL_THIRDPARTY_BUILD_GTEST : ${ECAL_THIRDPARTY_BUILD_GTEST}") -message(STATUS "ECAL_THIRDPARTY_BUILD_PROTOBUF : ${ECAL_THIRDPARTY_BUILD_PROTOBUF}") -message(STATUS "ECAL_THIRDPARTY_BUILD_CURL : ${ECAL_THIRDPARTY_BUILD_CURL}") message(STATUS "ECAL_THIRDPARTY_BUILD_HDF5 : ${ECAL_THIRDPARTY_BUILD_HDF5}") -message(STATUS "ECAL_THIRDPARTY_BUILD_YAML-CPP : ${ECAL_THIRDPARTY_BUILD_YAML-CPP}") +message(STATUS "ECAL_THIRDPARTY_BUILD_PROTOBUF : ${ECAL_THIRDPARTY_BUILD_PROTOBUF}") +message(STATUS "ECAL_THIRDPARTY_BUILD_QWT : ${ECAL_THIRDPARTY_BUILD_QWT}") +message(STATUS "ECAL_THIRDPARTY_BUILD_RECYCLE : ${ECAL_THIRDPARTY_BUILD_RECYCLE}") +message(STATUS "ECAL_THIRDPARTY_BUILD_SIMPLEINI : ${ECAL_THIRDPARTY_BUILD_SIMPLEINI}") +message(STATUS "ECAL_THIRDPARTY_BUILD_SPDLOG : ${ECAL_THIRDPARTY_BUILD_SPDLOG}") +message(STATUS "ECAL_THIRDPARTY_BUILD_TCLAP : ${ECAL_THIRDPARTY_BUILD_TCLAP}") +message(STATUS "ECAL_THIRDPARTY_BUILD_TCP_PUBSUB : ${ECAL_THIRDPARTY_BUILD_TCP_PUBSUB}") +message(STATUS "ECAL_THIRDPARTY_BUILD_TERMCOLOR : ${ECAL_THIRDPARTY_BUILD_TERMCOLOR}") +message(STATUS "ECAL_THIRDPARTY_BUILD_TINYXML2 : ${ECAL_THIRDPARTY_BUILD_TINYXML2}") message(STATUS "ECAL_THIRDPARTY_BUILD_UDPCAP : ${ECAL_THIRDPARTY_BUILD_UDPCAP}") +message(STATUS "ECAL_THIRDPARTY_BUILD_YAML-CPP : ${ECAL_THIRDPARTY_BUILD_YAML-CPP}") message(STATUS "ECAL_LINK_HDF5_SHARED : ${ECAL_LINK_HDF5_SHARED}") message(STATUS "CPACK_PACK_WITH_INNOSETUP : ${CPACK_PACK_WITH_INNOSETUP}") diff --git a/cmake/Modules/Findasio.cmake b/cmake/Modules/Findasio.cmake index f28df02422..bd712cc236 100644 --- a/cmake/Modules/Findasio.cmake +++ b/cmake/Modules/Findasio.cmake @@ -1,10 +1,5 @@ find_path(asio_INCLUDE_DIR NAMES asio.hpp - HINTS - "${CONAN_ASIO_ROOT}/include" - "${ECAL_PROJECT_ROOT}/thirdparty/asio/asio/include" - NO_DEFAULT_PATH - NO_CMAKE_FIND_ROOT_PATH ) if(asio_INCLUDE_DIR-NOTFOUND) diff --git a/cmake/Modules/FindeCAL.cmake b/cmake/Modules/FindeCAL.cmake new file mode 100644 index 0000000000..d20affb391 --- /dev/null +++ b/cmake/Modules/FindeCAL.cmake @@ -0,0 +1 @@ +set(eCAL_FOUND TRUE) \ No newline at end of file diff --git a/cmake/Modules/Findsimpleini.cmake b/cmake/Modules/Findsimpleini.cmake index 69b171aaec..4954f158fe 100644 --- a/cmake/Modules/Findsimpleini.cmake +++ b/cmake/Modules/Findsimpleini.cmake @@ -1,10 +1,5 @@ find_path(simpleini_INCLUDE_DIR NAMES SimpleIni.h - HINTS - "${CONAN_SIMPLEINI_ROOT}/include" - "${ECAL_PROJECT_ROOT}/thirdparty/simpleini" - NO_DEFAULT_PATH - NO_CMAKE_FIND_ROOT_PATH ) if(simpleini_INCLUDE_DIR-NOTFOUND) diff --git a/cmake/Modules/Findtclap.cmake b/cmake/Modules/Findtclap.cmake index f6ffa6d627..a0de08f50e 100644 --- a/cmake/Modules/Findtclap.cmake +++ b/cmake/Modules/Findtclap.cmake @@ -1,10 +1,5 @@ find_path(tclap_INCLUDE_DIR NAMES tclap/Arg.h - HINTS - "${CONAN_TCLAP_ROOT}/include" - "${ECAL_PROJECT_ROOT}/thirdparty/tclap/include" - NO_DEFAULT_PATH - NO_CMAKE_FIND_ROOT_PATH ) if(tclap_INCLUDE_DIR-NOTFOUND) diff --git a/thirdparty/asio-module/Findasio.cmake b/thirdparty/asio-module/Findasio.cmake new file mode 100644 index 0000000000..cbc155d906 --- /dev/null +++ b/thirdparty/asio-module/Findasio.cmake @@ -0,0 +1 @@ +set(asio_FOUND TRUE) \ No newline at end of file diff --git a/thirdparty/build-asio.cmake b/thirdparty/build-asio.cmake index e69de29bb2..d1fc7d09b5 100644 --- a/thirdparty/build-asio.cmake +++ b/thirdparty/build-asio.cmake @@ -0,0 +1,7 @@ +add_library(asio INTERFACE) +target_include_directories(asio INTERFACE ${CMAKE_CURRENT_LIST_DIR}/asio/asio/include) +target_compile_definitions(asio INTERFACE ASIO_STANDALONE) + +add_library(asio::asio ALIAS asio) + +list(PREPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/asio-module) \ No newline at end of file diff --git a/thirdparty/build-cmakefunctions.cmake b/thirdparty/build-cmakefunctions.cmake index ba641fe77a..a15173c2ba 100644 --- a/thirdparty/build-cmakefunctions.cmake +++ b/thirdparty/build-cmakefunctions.cmake @@ -1 +1,3 @@ -add_subdirectory(thirdparty/cmake_functions) \ No newline at end of file +add_subdirectory(thirdparty/cmake_functions) + +list(PREPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/cmakefunctions-module) \ No newline at end of file diff --git a/thirdparty/build-curl.cmake b/thirdparty/build-curl.cmake index f209fca450..b832f80d04 100644 --- a/thirdparty/build-curl.cmake +++ b/thirdparty/build-curl.cmake @@ -18,3 +18,5 @@ if (NOT TARGET CURL::libcurl) ) endif() endif() + +list(PREPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/curl-module) \ No newline at end of file diff --git a/thirdparty/build-fineftp.cmake b/thirdparty/build-fineftp.cmake index b214751e7d..484fe34c05 100644 --- a/thirdparty/build-fineftp.cmake +++ b/thirdparty/build-fineftp.cmake @@ -1,3 +1,6 @@ add_subdirectory(thirdparty/fineftp-server/fineftp-server EXCLUDE_FROM_ALL) set_property(TARGET server PROPERTY FOLDER lib/fineftp) -add_library(fineftp::server ALIAS server) \ No newline at end of file + +add_library(fineftp::server ALIAS server) + +list(PREPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/fineftp-module) \ No newline at end of file diff --git a/thirdparty/build-ftxui.cmake b/thirdparty/build-ftxui.cmake index a9cb1a8f77..6c3d5a20b6 100644 --- a/thirdparty/build-ftxui.cmake +++ b/thirdparty/build-ftxui.cmake @@ -9,4 +9,6 @@ if(content MATCHES "VERSION ([0-9]+)\\.[0-9]+\\.[0-9]+") set(ftxui_VERSION_MAJOR "${CMAKE_MATCH_1}") else() message(FATAL_ERROR "Couldn't read version info") -endif() \ No newline at end of file +endif() + +list(PREPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/ftxui-module) \ No newline at end of file diff --git a/thirdparty/build-gtest.cmake b/thirdparty/build-gtest.cmake index c3421a4f59..268767d35d 100644 --- a/thirdparty/build-gtest.cmake +++ b/thirdparty/build-gtest.cmake @@ -10,4 +10,6 @@ if(NOT TARGET GTest::gtest) endif() if(NOT TARGET GTest::gtest_main) add_library(GTest::gtest_main ALIAS gtest_main) -endif() \ No newline at end of file +endif() + +list(PREPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/gtest-module) \ No newline at end of file diff --git a/thirdparty/build-hdf5.cmake b/thirdparty/build-hdf5.cmake index 25de05d1e8..7255757e7f 100644 --- a/thirdparty/build-hdf5.cmake +++ b/thirdparty/build-hdf5.cmake @@ -14,19 +14,19 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/" CACHE PATH "") set(BUILD_SHARED_LIBS ON CACHE BOOL "Build hdf5 shared" FORCE) - list(APPEND as_subproject HDF5) #we will need threads find_package(Threads REQUIRED) - set(HDF5_GENERATE_HEADERS OFF CACHE BOOL "Do not re-generate auto-generated files" FORCE) - set(ONLY_SHARED_LIBS ON CACHE BOOL "Only Build Shared Libraries" FORCE) - set(HDF5_ENABLE_THREADSAFE ON CACHE BOOL "Enable thread-safety" FORCE) - set(BUILD_TESTING OFF CACHE BOOL "Do not build HDF5 Unit Testing" FORCE) - set(HDF5_BUILD_UTILS OFF CACHE BOOL "Do not build HDF5 Utils" FORCE) - set(HDF5_BUILD_TOOLS OFF CACHE BOOL "Do not build HDF5 Tools" FORCE) - set(HDF5_BUILD_EXAMPLES OFF CACHE BOOL "Do not build HDF5 Library Examples" FORCE) - set(HDF5_BUILD_CPP_LIB OFF CACHE BOOL "Do not build C++ lib" FORCE) - set(HDF5_BUILD_HL_LIB OFF CACHE BOOL "Do not build hdf5-hl" FORCE) + set(HDF5_GENERATE_HEADERS OFF CACHE BOOL "Do not re-generate auto-generated files" FORCE) + set(ONLY_SHARED_LIBS ON CACHE BOOL "Only Build Shared Libraries" FORCE) + set(HDF5_ENABLE_THREADSAFE ON CACHE BOOL "Enable thread-safety" FORCE) + set(HDF5_ENABLE_Z_LIB_SUPPORT OFF CACHE BOOL "Support ZLIB" FORCE) + set(BUILD_TESTING OFF CACHE BOOL "Do not build HDF5 Unit Testing" FORCE) + set(HDF5_BUILD_UTILS OFF CACHE BOOL "Do not build HDF5 Utils" FORCE) + set(HDF5_BUILD_TOOLS OFF CACHE BOOL "Do not build HDF5 Tools" FORCE) + set(HDF5_BUILD_EXAMPLES OFF CACHE BOOL "Do not build HDF5 Library Examples" FORCE) + set(HDF5_BUILD_CPP_LIB OFF CACHE BOOL "Do not build C++ lib" FORCE) + set(HDF5_BUILD_HL_LIB OFF CACHE BOOL "Do not build hdf5-hl" FORCE) # TODO: Let HDF5 use its own targets. # Adding the HDF5 targets to the eCALCoreTargets is a hack that we have had @@ -37,9 +37,9 @@ #We need to build hdf5 as shared to enable the threadsafe option. HDF5 uses the BUILD_SHARED_LIBS to check if shared build is on. # Hence we need to save the old value, enable it, and then set it back to the old value - + add_subdirectory(thirdparty/hdf5) - + if(NOT TARGET hdf5::hdf5-shared) add_library(hdf5::hdf5-shared ALIAS hdf5-shared) get_target_property(is_imported hdf5-shared IMPORTED) @@ -50,7 +50,7 @@ ) endif() endif() - + target_include_directories(hdf5-shared INTERFACE "$") if("${OLD_CMAKE_ARCHIVE_OUTPUT_DIRECTORY}" STREQUAL "") @@ -73,4 +73,6 @@ unset(CMAKE_RUNTIME_OUTPUT_DIRECTORY CACHE) endif() - set(BUILD_SHARED_LIBS ${OLD_BUILD_SHARED_LIBS} CACHE BOOL "Build hdf5 shared" FORCE) \ No newline at end of file + set(BUILD_SHARED_LIBS ${OLD_BUILD_SHARED_LIBS} CACHE BOOL "Build hdf5 shared" FORCE) + + list(PREPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/hdf5-module) \ No newline at end of file diff --git a/thirdparty/build-libssh2.cmake b/thirdparty/build-libssh2.cmake index 8eeb541f34..87d473eed1 100644 --- a/thirdparty/build-libssh2.cmake +++ b/thirdparty/build-libssh2.cmake @@ -1,4 +1,6 @@ set(DBUILD_STATIC_LIBS OFF CACHE BOOL "My option" FORCE) set(BUILD_TESTING OFF CACHE BOOL "My option" FORCE) add_subdirectory(thirdparty/libssh2) -add_library(LibSSH2 ALIAS libssh2) \ No newline at end of file +add_library(LibSSH2 ALIAS libssh2) + +list(PREPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/libssh2-module) \ No newline at end of file diff --git a/thirdparty/build-protobuf.cmake b/thirdparty/build-protobuf.cmake index fc41247d19..a6fe9f1ff4 100644 --- a/thirdparty/build-protobuf.cmake +++ b/thirdparty/build-protobuf.cmake @@ -47,4 +47,6 @@ if (NOT is_imported) endif() set(Protobuf_PROTOC_EXECUTABLE protoc) -set(Protobuf_VERSION 3.11.4) \ No newline at end of file +set(Protobuf_VERSION 3.11.4) + +list(PREPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/protobuf-module) \ No newline at end of file diff --git a/thirdparty/build-qwt.cmake b/thirdparty/build-qwt.cmake index 2b61122e00..67eed656f3 100644 --- a/thirdparty/build-qwt.cmake +++ b/thirdparty/build-qwt.cmake @@ -1 +1,3 @@ -add_subdirectory(thirdparty/qwt) \ No newline at end of file +add_subdirectory(thirdparty/qwt) + +list(PREPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/qwt-module) \ No newline at end of file diff --git a/thirdparty/build-recycle.cmake b/thirdparty/build-recycle.cmake index 035baf5fa4..6b29a2edae 100644 --- a/thirdparty/build-recycle.cmake +++ b/thirdparty/build-recycle.cmake @@ -1,2 +1,4 @@ add_subdirectory(thirdparty/recycle EXCLUDE_FROM_ALL) add_library(steinwurf::recycle ALIAS recycle) + +list(PREPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/recycle-module) \ No newline at end of file diff --git a/thirdparty/build-simpleini.cmake b/thirdparty/build-simpleini.cmake index e69de29bb2..b6fbf29d10 100644 --- a/thirdparty/build-simpleini.cmake +++ b/thirdparty/build-simpleini.cmake @@ -0,0 +1,5 @@ +add_library(simpleini INTERFACE) +target_include_directories(simpleini INTERFACE ${CMAKE_CURRENT_LIST_DIR}/simpleini) + +add_library(simpleini::simpleini ALIAS simpleini) +list(PREPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/simpleini-module) \ No newline at end of file diff --git a/thirdparty/build-spdlog.cmake b/thirdparty/build-spdlog.cmake index 47ab5546db..b90e75087a 100644 --- a/thirdparty/build-spdlog.cmake +++ b/thirdparty/build-spdlog.cmake @@ -13,4 +13,6 @@ if (NOT TARGET spdlog::spdlog) $<$>:-w> ) endif() -endif() \ No newline at end of file +endif() + +list(PREPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/spdlog-module) \ No newline at end of file diff --git a/thirdparty/build-tclap.cmake b/thirdparty/build-tclap.cmake index e69de29bb2..6be1ba6c39 100644 --- a/thirdparty/build-tclap.cmake +++ b/thirdparty/build-tclap.cmake @@ -0,0 +1,5 @@ +add_library(tclap INTERFACE) +target_include_directories(tclap INTERFACE ${CMAKE_CURRENT_LIST_DIR}/tclap/include) + +add_library(tclap::tclap ALIAS tclap) +list(PREPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/tclap-module) \ No newline at end of file diff --git a/thirdparty/build-tcp_pubsub.cmake b/thirdparty/build-tcp_pubsub.cmake index 2b44161fbe..562ba1e6d3 100644 --- a/thirdparty/build-tcp_pubsub.cmake +++ b/thirdparty/build-tcp_pubsub.cmake @@ -1,3 +1,5 @@ add_subdirectory(thirdparty/tcp_pubsub/tcp_pubsub EXCLUDE_FROM_ALL) set_property(TARGET tcp_pubsub PROPERTY FOLDER lib/tcp_pubsub) -add_library(tcp_pubsub::tcp_pubsub ALIAS tcp_pubsub) \ No newline at end of file +add_library(tcp_pubsub::tcp_pubsub ALIAS tcp_pubsub) + +list(PREPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/tcp_pubsub-module) \ No newline at end of file diff --git a/thirdparty/build-termcolor.cmake b/thirdparty/build-termcolor.cmake index 870c57fb2d..8e3bcf2bfc 100644 --- a/thirdparty/build-termcolor.cmake +++ b/thirdparty/build-termcolor.cmake @@ -1 +1,3 @@ -add_subdirectory(thirdparty/termcolor EXCLUDE_FROM_ALL) \ No newline at end of file +add_subdirectory(thirdparty/termcolor EXCLUDE_FROM_ALL) + +list(PREPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/termcolor-module) \ No newline at end of file diff --git a/thirdparty/build-tinyxml2.cmake b/thirdparty/build-tinyxml2.cmake index 0ab732be83..22af6331b9 100644 --- a/thirdparty/build-tinyxml2.cmake +++ b/thirdparty/build-tinyxml2.cmake @@ -14,4 +14,6 @@ if (NOT TARGET tinyxml2::tinyxml2) $<$>:-w> ) endif () -endif () \ No newline at end of file +endif () + +list(PREPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/tinyxml2-module) \ No newline at end of file diff --git a/thirdparty/build-udpcap.cmake b/thirdparty/build-udpcap.cmake index 5f72c908cf..0615ebb14b 100644 --- a/thirdparty/build-udpcap.cmake +++ b/thirdparty/build-udpcap.cmake @@ -25,3 +25,5 @@ unset(BUILD_SHARED_LIBS_OLD) # move the udpcap target to a subdirectory in the IDE set_property(TARGET udpcap PROPERTY FOLDER lib/udpcap) + +list(PREPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/udpcap-module) \ No newline at end of file diff --git a/thirdparty/build-yaml-cpp.cmake b/thirdparty/build-yaml-cpp.cmake index d3460762b4..36ecdde4a9 100644 --- a/thirdparty/build-yaml-cpp.cmake +++ b/thirdparty/build-yaml-cpp.cmake @@ -3,4 +3,6 @@ set(YAML_MSVC_SHARED_RT ON CACHE BOOL "My option" FORCE) set(YAML_BUILD_SHARED_LIBS OFF CACHE BOOL "My option" FORCE) set(YAML_CPP_BUILD_TOOLS OFF CACHE BOOL "My option" FORCE) set(YAML_CPP_BUILD_CONTRIB OFF CACHE BOOL "My option" FORCE) -add_subdirectory(thirdparty/yaml-cpp EXCLUDE_FROM_ALL) \ No newline at end of file +add_subdirectory(thirdparty/yaml-cpp EXCLUDE_FROM_ALL) + +list(PREPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/yaml-cpp-module) \ No newline at end of file diff --git a/thirdparty/build-zlib.cmake b/thirdparty/build-zlib.cmake index 924bb09fc0..3af9f66c1a 100644 --- a/thirdparty/build-zlib.cmake +++ b/thirdparty/build-zlib.cmake @@ -1,3 +1,5 @@ add_subdirectory(thirdparty/zlib) add_library(ZLIB::zlibstatic ALIAS zlibstatic) -add_library(ZLIB::zlib ALIAS zlib) \ No newline at end of file +add_library(ZLIB::zlib ALIAS zlib) + +list(PREPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/zlib-module) \ No newline at end of file diff --git a/thirdparty/cmakefunctions-module/FindCMakeFunctions.cmake b/thirdparty/cmakefunctions-module/FindCMakeFunctions.cmake new file mode 100644 index 0000000000..59d818aae5 --- /dev/null +++ b/thirdparty/cmakefunctions-module/FindCMakeFunctions.cmake @@ -0,0 +1 @@ +set(CMakeFunctions_FOUND TRUE) \ No newline at end of file diff --git a/thirdparty/curl-module/FindCURL.cmake b/thirdparty/curl-module/FindCURL.cmake new file mode 100644 index 0000000000..54d8b7635b --- /dev/null +++ b/thirdparty/curl-module/FindCURL.cmake @@ -0,0 +1 @@ +set(CURL_FOUND TRUE) \ No newline at end of file diff --git a/thirdparty/fineftp-module/Findfineftp.cmake b/thirdparty/fineftp-module/Findfineftp.cmake new file mode 100644 index 0000000000..56687b3b01 --- /dev/null +++ b/thirdparty/fineftp-module/Findfineftp.cmake @@ -0,0 +1 @@ +set(fineftp_FOUND TRUE) \ No newline at end of file diff --git a/thirdparty/ftxui-module/Findftxui.cmake b/thirdparty/ftxui-module/Findftxui.cmake new file mode 100644 index 0000000000..bf22607c96 --- /dev/null +++ b/thirdparty/ftxui-module/Findftxui.cmake @@ -0,0 +1 @@ +set(ftxui_FOUND TRUE) \ No newline at end of file diff --git a/thirdparty/gtest-module/FindGTest.cmake b/thirdparty/gtest-module/FindGTest.cmake new file mode 100644 index 0000000000..4cfd2bf497 --- /dev/null +++ b/thirdparty/gtest-module/FindGTest.cmake @@ -0,0 +1 @@ +set(GTest_FOUND TRUE) \ No newline at end of file diff --git a/thirdparty/hdf5-module/FindHDF5.cmake b/thirdparty/hdf5-module/FindHDF5.cmake new file mode 100644 index 0000000000..ade98531b5 --- /dev/null +++ b/thirdparty/hdf5-module/FindHDF5.cmake @@ -0,0 +1 @@ +set(HDF5_FOUND TRUE) \ No newline at end of file diff --git a/thirdparty/libssh2-module/Findlibssh2.cmake b/thirdparty/libssh2-module/Findlibssh2.cmake new file mode 100644 index 0000000000..b52e19ab53 --- /dev/null +++ b/thirdparty/libssh2-module/Findlibssh2.cmake @@ -0,0 +1 @@ +set(libssh2_FOUND TRUE) \ No newline at end of file diff --git a/thirdparty/protobuf-module/FindProtobuf.cmake b/thirdparty/protobuf-module/FindProtobuf.cmake new file mode 100644 index 0000000000..fc518cf829 --- /dev/null +++ b/thirdparty/protobuf-module/FindProtobuf.cmake @@ -0,0 +1 @@ +set(Protobuf_FOUND TRUE) \ No newline at end of file diff --git a/thirdparty/qwt-module/Findqwt.cmake b/thirdparty/qwt-module/Findqwt.cmake new file mode 100644 index 0000000000..180c4fe301 --- /dev/null +++ b/thirdparty/qwt-module/Findqwt.cmake @@ -0,0 +1 @@ +set(qwt_FOUND TRUE) \ No newline at end of file diff --git a/thirdparty/recycle-module/Findrecycle.cmake b/thirdparty/recycle-module/Findrecycle.cmake new file mode 100644 index 0000000000..84dde3a2e7 --- /dev/null +++ b/thirdparty/recycle-module/Findrecycle.cmake @@ -0,0 +1 @@ +set(recycle_FOUND TRUE) \ No newline at end of file diff --git a/thirdparty/simpleini-module/Findsimpleini.cmake b/thirdparty/simpleini-module/Findsimpleini.cmake new file mode 100644 index 0000000000..aa8def2df4 --- /dev/null +++ b/thirdparty/simpleini-module/Findsimpleini.cmake @@ -0,0 +1 @@ +set(simpleini_FOUND TRUE) \ No newline at end of file diff --git a/thirdparty/spdlog-module/Findspdlog.cmake b/thirdparty/spdlog-module/Findspdlog.cmake new file mode 100644 index 0000000000..6d9fb9c589 --- /dev/null +++ b/thirdparty/spdlog-module/Findspdlog.cmake @@ -0,0 +1 @@ +set(spdlog_FOUND TRUE) \ No newline at end of file diff --git a/thirdparty/tclap-module/Findtclap.cmake b/thirdparty/tclap-module/Findtclap.cmake new file mode 100644 index 0000000000..878f3bfdc1 --- /dev/null +++ b/thirdparty/tclap-module/Findtclap.cmake @@ -0,0 +1 @@ +set(tclap_FOUND TRUE) \ No newline at end of file diff --git a/thirdparty/tcp_pubsub-module/Findtcp_pubsub.cmake b/thirdparty/tcp_pubsub-module/Findtcp_pubsub.cmake new file mode 100644 index 0000000000..8f8e0a51b4 --- /dev/null +++ b/thirdparty/tcp_pubsub-module/Findtcp_pubsub.cmake @@ -0,0 +1 @@ +set(tcp_pubsub_FOUND TRUE) \ No newline at end of file diff --git a/thirdparty/termcolor-module/Findtermcolor.cmake b/thirdparty/termcolor-module/Findtermcolor.cmake new file mode 100644 index 0000000000..dd1636a7b1 --- /dev/null +++ b/thirdparty/termcolor-module/Findtermcolor.cmake @@ -0,0 +1 @@ +set(termcolor_FOUND TRUE) \ No newline at end of file diff --git a/thirdparty/tinyxml2-module/Findtinyxml2.cmake b/thirdparty/tinyxml2-module/Findtinyxml2.cmake new file mode 100644 index 0000000000..b10d41ba67 --- /dev/null +++ b/thirdparty/tinyxml2-module/Findtinyxml2.cmake @@ -0,0 +1 @@ +set(tinyxml2_FOUND TRUE) \ No newline at end of file diff --git a/thirdparty/udpcap-module/Findudpcap.cmake b/thirdparty/udpcap-module/Findudpcap.cmake new file mode 100644 index 0000000000..5a86153301 --- /dev/null +++ b/thirdparty/udpcap-module/Findudpcap.cmake @@ -0,0 +1 @@ +set(udpcap_FOUND TRUE) \ No newline at end of file diff --git a/thirdparty/yaml-cpp-module/Findyaml-cpp.cmake b/thirdparty/yaml-cpp-module/Findyaml-cpp.cmake new file mode 100644 index 0000000000..93a6f5c624 --- /dev/null +++ b/thirdparty/yaml-cpp-module/Findyaml-cpp.cmake @@ -0,0 +1 @@ +set(yaml-cpp_FOUND TRUE) \ No newline at end of file diff --git a/thirdparty/zlib-module/Findzlib.cmake b/thirdparty/zlib-module/Findzlib.cmake new file mode 100644 index 0000000000..8a435b0faf --- /dev/null +++ b/thirdparty/zlib-module/Findzlib.cmake @@ -0,0 +1 @@ +set(zlib_FOUND TRUE) \ No newline at end of file