Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sync-with-eclipse-ecal-2024-08-02 #77

Merged
merged 5 commits into from
Aug 2, 2024
Merged

sync-with-eclipse-ecal-2024-08-02 #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
decec4e
sync-with-eclipse-ecal-2024-08-02
rex-schilasky Aug 2, 2024
6f2ed9d
linuxptp module removed
rex-schilasky Aug 2, 2024
a747bd3
ecal.ini -> ecal.yaml
rex-schilasky Aug 2, 2024
a6f6954
ecal.yaml copy removed
rex-schilasky Aug 2, 2024
72a6718
missing include
rex-schilasky Aug 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ body:
Platform : x64

------------------------- CONFIGURATION --------------------------
Default INI : C:\ProgramData\eCAL\ecal.ini
Default INI : C:\ProgramData\eCAL\ecal.yaml

------------------------- NETWORK --------------------------------
Host name : MYHOST
Expand Down
24 changes: 11 additions & 13 deletions .github/workflows/build-macos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
ECAL_CORE_HAS_PROTOBUF: "OFF"
ECAL_CORE_BUILD_SAMPLES: "ON"
ECAL_CORE_BUILD_TESTS: "ON"
ECAL_CORE_CONFIG_INIFILE: "ON"
ECAL_CORE_CONFIGURATION: "ON"
ECAL_CORE_COMMAND_LINE: "ON"
ECAL_CORE_REGISTRATION: "ON"
ECAL_CORE_REGISTRATION_SHM: "ON"
Expand All @@ -42,7 +42,7 @@ jobs:
ECAL_CORE_HAS_PROTOBUF: "ON"
ECAL_CORE_BUILD_SAMPLES: "ON"
ECAL_CORE_BUILD_TESTS: "ON"
ECAL_CORE_CONFIG_INIFILE: "ON"
ECAL_CORE_CONFIGURATION: "ON"
ECAL_CORE_COMMAND_LINE: "ON"
ECAL_CORE_REGISTRATION: "ON"
ECAL_CORE_REGISTRATION_SHM: "ON"
Expand All @@ -64,7 +64,7 @@ jobs:
ECAL_CORE_HAS_PROTOBUF: "OFF"
ECAL_CORE_BUILD_SAMPLES: "ON"
ECAL_CORE_BUILD_TESTS: "ON"
ECAL_CORE_CONFIG_INIFILE: "OFF"
ECAL_CORE_CONFIGURATION: "OFF"
ECAL_CORE_COMMAND_LINE: "OFF"
ECAL_CORE_REGISTRATION: "ON"
ECAL_CORE_REGISTRATION_SHM: "ON"
Expand All @@ -86,7 +86,7 @@ jobs:
ECAL_CORE_HAS_PROTOBUF: "ON"
ECAL_CORE_BUILD_SAMPLES: "ON"
ECAL_CORE_BUILD_TESTS: "ON"
ECAL_CORE_CONFIG_INIFILE: "OFF"
ECAL_CORE_CONFIGURATION: "OFF"
ECAL_CORE_COMMAND_LINE: "OFF"
ECAL_CORE_REGISTRATION: "ON"
ECAL_CORE_REGISTRATION_SHM: "ON"
Expand All @@ -108,7 +108,7 @@ jobs:
ECAL_CORE_HAS_PROTOBUF: "OFF"
ECAL_CORE_BUILD_SAMPLES: "ON"
ECAL_CORE_BUILD_TESTS: "ON"
ECAL_CORE_CONFIG_INIFILE: "OFF"
ECAL_CORE_CONFIGURATION: "OFF"
ECAL_CORE_COMMAND_LINE: "OFF"
ECAL_CORE_REGISTRATION: "OFF"
ECAL_CORE_REGISTRATION_SHM: "OFF"
Expand All @@ -130,7 +130,7 @@ jobs:
ECAL_CORE_HAS_PROTOBUF: "OFF"
ECAL_CORE_BUILD_SAMPLES: "ON"
ECAL_CORE_BUILD_TESTS: "ON"
ECAL_CORE_CONFIG_INIFILE: "OFF"
ECAL_CORE_CONFIGURATION: "OFF"
ECAL_CORE_COMMAND_LINE: "OFF"
ECAL_CORE_REGISTRATION: "ON"
ECAL_CORE_REGISTRATION_SHM: "OFF"
Expand All @@ -152,7 +152,7 @@ jobs:
ECAL_CORE_HAS_PROTOBUF: "OFF"
ECAL_CORE_BUILD_SAMPLES: "ON"
ECAL_CORE_BUILD_TESTS: "ON"
ECAL_CORE_CONFIG_INIFILE: "OFF"
ECAL_CORE_CONFIGURATION: "OFF"
ECAL_CORE_COMMAND_LINE: "OFF"
ECAL_CORE_REGISTRATION: "ON"
ECAL_CORE_REGISTRATION_SHM: "OFF"
Expand All @@ -174,7 +174,7 @@ jobs:
ECAL_CORE_HAS_PROTOBUF: "OFF"
ECAL_CORE_BUILD_SAMPLES: "ON"
ECAL_CORE_BUILD_TESTS: "ON"
ECAL_CORE_CONFIG_INIFILE: "OFF"
ECAL_CORE_CONFIGURATION: "OFF"
ECAL_CORE_COMMAND_LINE: "OFF"
ECAL_CORE_REGISTRATION: "ON"
ECAL_CORE_REGISTRATION_SHM: "ON"
Expand All @@ -196,7 +196,7 @@ jobs:
ECAL_CORE_HAS_PROTOBUF: "ON"
ECAL_CORE_BUILD_SAMPLES: "ON"
ECAL_CORE_BUILD_TESTS: "ON"
ECAL_CORE_CONFIG_INIFILE: "OFF"
ECAL_CORE_CONFIGURATION: "OFF"
ECAL_CORE_COMMAND_LINE: "OFF"
ECAL_CORE_REGISTRATION: "ON"
ECAL_CORE_REGISTRATION_SHM: "ON"
Expand All @@ -218,7 +218,7 @@ jobs:
ECAL_CORE_HAS_PROTOBUF: "ON"
ECAL_CORE_BUILD_SAMPLES: "ON"
ECAL_CORE_BUILD_TESTS: "ON"
ECAL_CORE_CONFIG_INIFILE: "OFF"
ECAL_CORE_CONFIGURATION: "OFF"
ECAL_CORE_COMMAND_LINE: "OFF"
ECAL_CORE_REGISTRATION: "ON"
ECAL_CORE_REGISTRATION_SHM: "OFF"
Expand Down Expand Up @@ -254,7 +254,7 @@ jobs:
-DECAL_CORE_HAS_PROTOBUF=${{ matrix.build_configuration.ECAL_CORE_HAS_PROTOBUF }} \
-DECAL_CORE_BUILD_SAMPLES=${{ matrix.build_configuration.ECAL_CORE_BUILD_SAMPLES }} \
-DECAL_CORE_BUILD_TESTS=${{ matrix.build_configuration.ECAL_CORE_BUILD_TESTS }} \
-DECAL_CORE_CONFIG_INIFILE=${{ matrix.build_configuration.ECAL_CORE_CONFIG_INIFILE }} \
-DECAL_CORE_CONFIGURATION=${{ matrix.build_configuration.ECAL_CORE_CONFIGURATION }} \
-DECAL_CORE_COMMAND_LINE=${{ matrix.build_configuration.ECAL_CORE_COMMAND_LINE }} \
-DECAL_CORE_REGISTRATION=${{ matrix.build_configuration.ECAL_CORE_REGISTRATION }} \
-DECAL_CORE_REGISTRATION_SHM=${{ matrix.build_configuration.ECAL_CORE_REGISTRATION_SHM }} \
Expand All @@ -272,8 +272,6 @@ jobs:
-DCMAKE_BUILD_TYPE=${{ matrix.build_configuration.CMAKE_BUILD_TYPE }} \
-DCMAKE_CXX_STANDARD=17 \
-DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
sudo mkdir /etc/ecal
sudo cp "$GITHUB_WORKSPACE/ecal/core/cfg/ecal.ini" /etc/ecal
shell: bash

- name: Build Release
Expand Down
24 changes: 11 additions & 13 deletions .github/workflows/build-ubuntu.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
ECAL_CORE_HAS_PROTOBUF: "OFF"
ECAL_CORE_BUILD_SAMPLES: "ON"
ECAL_CORE_BUILD_TESTS: "ON"
ECAL_CORE_CONFIG_INIFILE: "ON"
ECAL_CORE_CONFIGURATION: "ON"
ECAL_CORE_COMMAND_LINE: "ON"
ECAL_CORE_REGISTRATION: "ON"
ECAL_CORE_REGISTRATION_SHM: "ON"
Expand All @@ -42,7 +42,7 @@ jobs:
ECAL_CORE_HAS_PROTOBUF: "ON"
ECAL_CORE_BUILD_SAMPLES: "ON"
ECAL_CORE_BUILD_TESTS: "ON"
ECAL_CORE_CONFIG_INIFILE: "ON"
ECAL_CORE_CONFIGURATION: "ON"
ECAL_CORE_COMMAND_LINE: "ON"
ECAL_CORE_REGISTRATION: "ON"
ECAL_CORE_REGISTRATION_SHM: "ON"
Expand All @@ -64,7 +64,7 @@ jobs:
ECAL_CORE_HAS_PROTOBUF: "OFF"
ECAL_CORE_BUILD_SAMPLES: "ON"
ECAL_CORE_BUILD_TESTS: "ON"
ECAL_CORE_CONFIG_INIFILE: "OFF"
ECAL_CORE_CONFIGURATION: "OFF"
ECAL_CORE_COMMAND_LINE: "OFF"
ECAL_CORE_REGISTRATION: "ON"
ECAL_CORE_REGISTRATION_SHM: "ON"
Expand All @@ -86,7 +86,7 @@ jobs:
ECAL_CORE_HAS_PROTOBUF: "ON"
ECAL_CORE_BUILD_SAMPLES: "ON"
ECAL_CORE_BUILD_TESTS: "ON"
ECAL_CORE_CONFIG_INIFILE: "OFF"
ECAL_CORE_CONFIGURATION: "OFF"
ECAL_CORE_COMMAND_LINE: "OFF"
ECAL_CORE_REGISTRATION: "ON"
ECAL_CORE_REGISTRATION_SHM: "ON"
Expand All @@ -108,7 +108,7 @@ jobs:
ECAL_CORE_HAS_PROTOBUF: "OFF"
ECAL_CORE_BUILD_SAMPLES: "ON"
ECAL_CORE_BUILD_TESTS: "ON"
ECAL_CORE_CONFIG_INIFILE: "OFF"
ECAL_CORE_CONFIGURATION: "OFF"
ECAL_CORE_COMMAND_LINE: "OFF"
ECAL_CORE_REGISTRATION: "OFF"
ECAL_CORE_REGISTRATION_SHM: "OFF"
Expand All @@ -130,7 +130,7 @@ jobs:
ECAL_CORE_HAS_PROTOBUF: "OFF"
ECAL_CORE_BUILD_SAMPLES: "ON"
ECAL_CORE_BUILD_TESTS: "ON"
ECAL_CORE_CONFIG_INIFILE: "OFF"
ECAL_CORE_CONFIGURATION: "OFF"
ECAL_CORE_COMMAND_LINE: "OFF"
ECAL_CORE_REGISTRATION: "ON"
ECAL_CORE_REGISTRATION_SHM: "OFF"
Expand All @@ -152,7 +152,7 @@ jobs:
ECAL_CORE_HAS_PROTOBUF: "OFF"
ECAL_CORE_BUILD_SAMPLES: "ON"
ECAL_CORE_BUILD_TESTS: "ON"
ECAL_CORE_CONFIG_INIFILE: "OFF"
ECAL_CORE_CONFIGURATION: "OFF"
ECAL_CORE_COMMAND_LINE: "OFF"
ECAL_CORE_REGISTRATION: "ON"
ECAL_CORE_REGISTRATION_SHM: "OFF"
Expand All @@ -174,7 +174,7 @@ jobs:
ECAL_CORE_HAS_PROTOBUF: "OFF"
ECAL_CORE_BUILD_SAMPLES: "ON"
ECAL_CORE_BUILD_TESTS: "ON"
ECAL_CORE_CONFIG_INIFILE: "OFF"
ECAL_CORE_CONFIGURATION: "OFF"
ECAL_CORE_COMMAND_LINE: "OFF"
ECAL_CORE_REGISTRATION: "ON"
ECAL_CORE_REGISTRATION_SHM: "ON"
Expand All @@ -196,7 +196,7 @@ jobs:
ECAL_CORE_HAS_PROTOBUF: "ON"
ECAL_CORE_BUILD_SAMPLES: "ON"
ECAL_CORE_BUILD_TESTS: "ON"
ECAL_CORE_CONFIG_INIFILE: "OFF"
ECAL_CORE_CONFIGURATION: "OFF"
ECAL_CORE_COMMAND_LINE: "OFF"
ECAL_CORE_REGISTRATION: "ON"
ECAL_CORE_REGISTRATION_SHM: "ON"
Expand All @@ -218,7 +218,7 @@ jobs:
ECAL_CORE_HAS_PROTOBUF: "ON"
ECAL_CORE_BUILD_SAMPLES: "ON"
ECAL_CORE_BUILD_TESTS: "ON"
ECAL_CORE_CONFIG_INIFILE: "OFF"
ECAL_CORE_CONFIGURATION: "OFF"
ECAL_CORE_COMMAND_LINE: "OFF"
ECAL_CORE_REGISTRATION: "ON"
ECAL_CORE_REGISTRATION_SHM: "OFF"
Expand Down Expand Up @@ -258,7 +258,7 @@ jobs:
-DECAL_CORE_HAS_PROTOBUF=${{ matrix.build_configuration.ECAL_CORE_HAS_PROTOBUF }} \
-DECAL_CORE_BUILD_SAMPLES=${{ matrix.build_configuration.ECAL_CORE_BUILD_SAMPLES }} \
-DECAL_CORE_BUILD_TESTS=${{ matrix.build_configuration.ECAL_CORE_BUILD_TESTS }} \
-DECAL_CORE_CONFIG_INIFILE=${{ matrix.build_configuration.ECAL_CORE_CONFIG_INIFILE }} \
-DECAL_CORE_CONFIGURATION=${{ matrix.build_configuration.ECAL_CORE_CONFIGURATION }} \
-DECAL_CORE_COMMAND_LINE=${{ matrix.build_configuration.ECAL_CORE_COMMAND_LINE }} \
-DECAL_CORE_REGISTRATION=${{ matrix.build_configuration.ECAL_CORE_REGISTRATION }} \
-DECAL_CORE_REGISTRATION_SHM=${{ matrix.build_configuration.ECAL_CORE_REGISTRATION_SHM }} \
Expand All @@ -278,8 +278,6 @@ jobs:
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LOCALSTATEDIR=/var \
-DCMAKE_INSTALL_LIBDIR=lib/x86_64-linux-gnu
sudo mkdir /etc/ecal
sudo cp "$GITHUB_WORKSPACE/ecal/core/cfg/ecal.ini" /etc/ecal
shell: bash

- name: Build Release
Expand Down
24 changes: 11 additions & 13 deletions .github/workflows/build-windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
ECAL_CORE_HAS_PROTOBUF: "OFF"
ECAL_CORE_BUILD_SAMPLES: "ON"
ECAL_CORE_BUILD_TESTS: "ON"
ECAL_CORE_CONFIG_INIFILE: "ON"
ECAL_CORE_CONFIGURATION: "ON"
ECAL_CORE_COMMAND_LINE: "ON"
ECAL_CORE_REGISTRATION: "ON"
ECAL_CORE_REGISTRATION_SHM: "ON"
Expand All @@ -41,7 +41,7 @@ jobs:
ECAL_CORE_HAS_PROTOBUF: "ON"
ECAL_CORE_BUILD_SAMPLES: "ON"
ECAL_CORE_BUILD_TESTS: "ON"
ECAL_CORE_CONFIG_INIFILE: "ON"
ECAL_CORE_CONFIGURATION: "ON"
ECAL_CORE_COMMAND_LINE: "ON"
ECAL_CORE_REGISTRATION: "ON"
ECAL_CORE_REGISTRATION_SHM: "ON"
Expand All @@ -62,7 +62,7 @@ jobs:
ECAL_CORE_HAS_PROTOBUF: "OFF"
ECAL_CORE_BUILD_SAMPLES: "ON"
ECAL_CORE_BUILD_TESTS: "ON"
ECAL_CORE_CONFIG_INIFILE: "OFF"
ECAL_CORE_CONFIGURATION: "OFF"
ECAL_CORE_COMMAND_LINE: "OFF"
ECAL_CORE_REGISTRATION: "ON"
ECAL_CORE_REGISTRATION_SHM: "ON"
Expand All @@ -83,7 +83,7 @@ jobs:
ECAL_CORE_HAS_PROTOBUF: "ON"
ECAL_CORE_BUILD_SAMPLES: "ON"
ECAL_CORE_BUILD_TESTS: "ON"
ECAL_CORE_CONFIG_INIFILE: "OFF"
ECAL_CORE_CONFIGURATION: "OFF"
ECAL_CORE_COMMAND_LINE: "OFF"
ECAL_CORE_REGISTRATION: "ON"
ECAL_CORE_REGISTRATION_SHM: "ON"
Expand All @@ -104,7 +104,7 @@ jobs:
ECAL_CORE_HAS_PROTOBUF: "OFF"
ECAL_CORE_BUILD_SAMPLES: "ON"
ECAL_CORE_BUILD_TESTS: "ON"
ECAL_CORE_CONFIG_INIFILE: "OFF"
ECAL_CORE_CONFIGURATION: "OFF"
ECAL_CORE_COMMAND_LINE: "OFF"
ECAL_CORE_REGISTRATION: "OFF"
ECAL_CORE_REGISTRATION_SHM: "OFF"
Expand All @@ -125,7 +125,7 @@ jobs:
ECAL_CORE_HAS_PROTOBUF: "OFF"
ECAL_CORE_BUILD_SAMPLES: "ON"
ECAL_CORE_BUILD_TESTS: "ON"
ECAL_CORE_CONFIG_INIFILE: "OFF"
ECAL_CORE_CONFIGURATION: "OFF"
ECAL_CORE_COMMAND_LINE: "OFF"
ECAL_CORE_REGISTRATION: "ON"
ECAL_CORE_REGISTRATION_SHM: "OFF"
Expand All @@ -146,7 +146,7 @@ jobs:
ECAL_CORE_HAS_PROTOBUF: "OFF"
ECAL_CORE_BUILD_SAMPLES: "ON"
ECAL_CORE_BUILD_TESTS: "ON"
ECAL_CORE_CONFIG_INIFILE: "OFF"
ECAL_CORE_CONFIGURATION: "OFF"
ECAL_CORE_COMMAND_LINE: "OFF"
ECAL_CORE_REGISTRATION: "ON"
ECAL_CORE_REGISTRATION_SHM: "OFF"
Expand All @@ -167,7 +167,7 @@ jobs:
ECAL_CORE_HAS_PROTOBUF: "OFF"
ECAL_CORE_BUILD_SAMPLES: "ON"
ECAL_CORE_BUILD_TESTS: "ON"
ECAL_CORE_CONFIG_INIFILE: "OFF"
ECAL_CORE_CONFIGURATION: "OFF"
ECAL_CORE_COMMAND_LINE: "OFF"
ECAL_CORE_REGISTRATION: "ON"
ECAL_CORE_REGISTRATION_SHM: "ON"
Expand All @@ -188,7 +188,7 @@ jobs:
ECAL_CORE_HAS_PROTOBUF: "ON"
ECAL_CORE_BUILD_SAMPLES: "ON"
ECAL_CORE_BUILD_TESTS: "ON"
ECAL_CORE_CONFIG_INIFILE: "OFF"
ECAL_CORE_CONFIGURATION: "OFF"
ECAL_CORE_COMMAND_LINE: "OFF"
ECAL_CORE_REGISTRATION: "ON"
ECAL_CORE_REGISTRATION_SHM: "ON"
Expand All @@ -209,7 +209,7 @@ jobs:
ECAL_CORE_HAS_PROTOBUF: "ON"
ECAL_CORE_BUILD_SAMPLES: "ON"
ECAL_CORE_BUILD_TESTS: "ON"
ECAL_CORE_CONFIG_INIFILE: "OFF"
ECAL_CORE_CONFIGURATION: "OFF"
ECAL_CORE_COMMAND_LINE: "OFF"
ECAL_CORE_REGISTRATION: "ON"
ECAL_CORE_REGISTRATION_SHM: "OFF"
Expand Down Expand Up @@ -241,7 +241,7 @@ jobs:
-DECAL_CORE_HAS_PROTOBUF=${{ matrix.build_configuration.ECAL_CORE_HAS_PROTOBUF }} ^
-DECAL_CORE_BUILD_SAMPLES=${{ matrix.build_configuration.ECAL_CORE_BUILD_SAMPLES }} ^
-DECAL_CORE_BUILD_TESTS=${{ matrix.build_configuration.ECAL_CORE_BUILD_TESTS }} ^
-DECAL_CORE_CONFIG_INIFILE=${{ matrix.build_configuration.ECAL_CORE_CONFIG_INIFILE }} ^
-DECAL_CORE_CONFIGURATION=${{ matrix.build_configuration.ECAL_CORE_CONFIGURATION }} ^
-DECAL_CORE_COMMAND_LINE=${{ matrix.build_configuration.ECAL_CORE_COMMAND_LINE }} ^
-DECAL_CORE_REGISTRATION=${{ matrix.build_configuration.ECAL_CORE_REGISTRATION }} ^
-DECAL_CORE_REGISTRATION_SHM=${{ matrix.build_configuration.ECAL_CORE_REGISTRATION_SHM }} ^
Expand All @@ -256,8 +256,6 @@ jobs:
-DECAL_CORE_NPCAP_SUPPORT=${{ matrix.build_configuration.ECAL_CORE_NPCAP_SUPPORT }} ^
-DBUILD_SHARED_LIBS=${{ matrix.build_configuration.BUILD_SHARED_LIBS }} ^
-DCMAKE_BUILD_TYPE=${{ matrix.build_configuration.CMAKE_BUILD_TYPE }}
mkdir "%ALLUSERSPROFILE%\eCAL"
copy "%GITHUB_WORKSPACE%\ecal\core\cfg\ecal.ini" "%ALLUSERSPROFILE%\eCAL"
shell: cmd

- name: Build Release
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/clang-tidy-review.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
-DECAL_CORE_HAS_PROTOBUF=ON \
-DECAL_CORE_BUILD_SAMPLES=ON \
-DECAL_CORE_BUILD_TESTS=ON \
-DECAL_CORE_CONFIG_INIFILE=ON \
-DECAL_CORE_CONFIGURATION=ON \
-DECAL_CORE_COMMAND_LINE=ON \
-DECAL_CORE_REGISTRATION=ON \
-DECAL_CORE_REGISTRATION_SHM=ON \
Expand Down
3 changes: 0 additions & 3 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@
[submodule "thirdparty/protobuf/protobuf"]
path = thirdparty/protobuf/protobuf
url = https://github.com/protocolbuffers/protobuf.git
[submodule "thirdparty/simpleini/simpleini"]
path = thirdparty/simpleini/simpleini
url = https://github.com/brofield/simpleini.git
[submodule "thirdparty/tclap/tclap"]
path = thirdparty/tclap/tclap
url = https://github.com/xguerin/tclap.git
Expand Down
6 changes: 3 additions & 3 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ endif()

# ------------------------------------------------------------------------------------------------------------------------------------------------------------------
# configurable build options
# command line usage: cmake .. -DBUILD_SAMPLES=ON -DBUILD_ECAL_TESTS=OFF -DECAL_CORE_CONFIG_INIFILE=OFF
# command line usage: cmake .. -DBUILD_SAMPLES=ON -DBUILD_ECAL_TESTS=OFF -DECAL_CORE_CONFIGURATION=OFF
# ------------------------------------------------------------------------------------------------------------------------------------------------------------------

include(${CMAKE_CURRENT_SOURCE_DIR}/ecal/ecal-core-options.cmake)
Expand Down Expand Up @@ -259,7 +259,7 @@ message(STATUS "----------------------------------------------------------------
message(STATUS "ECAL_CORE_BUILD_SAMPLES : ${ECAL_CORE_BUILD_SAMPLES}")
message(STATUS "ECAL_CORE_BUILD_TESTS : ${ECAL_CORE_BUILD_TESTS}")
message(STATUS "--------------------------------------------------------------------------------")
message(STATUS "ECAL_CORE_CONFIG_INIFILE : ${ECAL_CORE_CONFIG_INIFILE}")
message(STATUS "ECAL_CORE_CONFIGURATION : ${ECAL_CORE_CONFIGURATION}")
message(STATUS "ECAL_CORE_COMMAND_LINE : ${ECAL_CORE_COMMAND_LINE}")
message(STATUS "ECAL_CORE_REGISTRATION : ${ECAL_CORE_REGISTRATION}")
message(STATUS "ECAL_CORE_MONITORING : ${ECAL_CORE_MONITORING}")
Expand All @@ -279,8 +279,8 @@ message(STATUS "ECAL_THIRDPARTY_BUILD_ASIO : ${ECAL_THIRDPAR
message(STATUS "ECAL_THIRDPARTY_BUILD_CMAKEFUNCTIONS : ${ECAL_THIRDPARTY_BUILD_CMAKEFUNCTIONS}")
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_SIMPLEINI : ${ECAL_THIRDPARTY_BUILD_SIMPLEINI}")
message(STATUS "ECAL_THIRDPARTY_BUILD_TCLAP : ${ECAL_THIRDPARTY_BUILD_TCLAP}")
message(STATUS "ECAL_THIRDPARTY_BUILD_UDPCAP : ${ECAL_THIRDPARTY_BUILD_UDPCAP}")
message(STATUS "ECAL_THIRDPARTY_BUILD_ECALUDP : ${ECAL_THIRDPARTY_BUILD_ECALUDP}")
message(STATUS "ECAL_THIRDPARTY_BUILD_YAML-CPP : ${ECAL_THIRDPARTY_BUILD_YAML-CPP}")
message(STATUS "--------------------------------------------------------------------------------")
Loading
Loading