Skip to content

Commit 505f18b

Browse files
flagardeflagarde
committed
compile
1 parent 5340498 commit 505f18b

19 files changed

+245
-106
lines changed

‎CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" "${CMAKE_CURRENT_SOURCE_DIR}/cmake"
2222
include("${CMAKE_CURRENT_SOURCE_DIR}/Settings.cmake")
2323

2424
include(GetCMakeMM)
25-
cmmm(VERSION "2.3" REPOSITORY "flagarde/CMakeMM" PROVIDER "github" VERBOSITY VERBOSE)
25+
cmmm(VERSION "1.0")
2626

27-
cmmm_modules_list(REPOSITORY "flagarde/CMakeCM" PROVIDER "github")
27+
cmmm_modules_list(URL "gh:flagarde/CMakeCM" FILEPATH "ModulesListNew.cmake")
2828

2929
project(YAODAQ VERSION "0.0.1.0" DESCRIPTION "Yet An Other DAQ" HOMEPAGE_URL "https://github.com/flagarde/YAODAQ" LANGUAGES CXX)
3030

‎Settings.cmake‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ option(BUILD_EXAMPLES "Build the examples" TRUE)
1313
option(BUILD_EXTRAS "Build the extras" TRUE)
1414
# Compiling ROOT can be very long so :
1515

16-
#option(BUILD_ROOT "Build ROOT Folder" ON)
16+
option(BUILD_ROOT "Build ROOT Folder" OFF)
1717

1818
option(BUILD_ANALYSIS "Build the Analysis code" ON)
1919
option(BUILD_WEBSOCKETSERVER "Build the WebSocket Server" ON)
@@ -53,7 +53,7 @@ option(ENABLE_DOCTESTS "Include tests in the library. Setting this to OFF will r
5353
#////////////////////////////////////#
5454
# Doctest #
5555
#////////////////////////////////////#
56-
set(DOCTEST_TAG "v2.4.11")
56+
set(DOCTEST_TAG "v2.4.12")
5757
set(DOCTEST_REPOSITORY "https://github.com/onqtam/doctest.git")
5858

5959
######################################
@@ -63,7 +63,7 @@ set(DOCTEST_REPOSITORY "https://github.com/onqtam/doctest.git")
6363
#////////////////////////////////////#
6464
# CLI11 #
6565
#////////////////////////////////////#
66-
set(CLI11_TAG "v2.4.1")
66+
set(CLI11_TAG "v2.6.1")
6767
set(CLI11_REPOSITORY "https://github.com/CLIUtils/CLI11.git")
6868

6969
######################################
@@ -73,14 +73,14 @@ set(CLI11_REPOSITORY "https://github.com/CLIUtils/CLI11.git")
7373
#////////////////////////////////////#
7474
# CPM.CMake #
7575
#////////////////////////////////////#
76-
set(CPM_DEFAULT_VERSION "0.38.7")
76+
set(CPM_DEFAULT_VERSION "0.42.0")
7777
set(CPM_URL "https://github.com/cpm-cmake/CPM.cmake/releases/download/v${CPM_DEFAULT_VERSION}/CPM.cmake")
7878

7979
#////////////////////////////////////#
8080
# OpenSSL #
8181
#////////////////////////////////////#
8282
set(USE_SYSTEM_OPENSSL OFF)
83-
set(OPENSSLCMAKE_TAG "v2.1")
83+
set(OPENSSLCMAKE_TAG "v2.4")
8484
set(OPENSSLCMAKE_REPOSITORY "https://github.com/flagarde/openssl-cmake.git")
8585
set(OPENSSL_VERSION "1.1.1l")
8686
set(OPENSSL_URL "https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz")
@@ -90,14 +90,14 @@ set(OPENSSL_URL_HASH "SHA256=0b7a3e5e59c34827fe0c3a74b7ec8baef302b98fa80088d7f91
9090
# Zlib-ng #
9191
#////////////////////////////////////#
9292
set(USE_SYSTEM_ZLIB OFF)
93-
set(ZLIB-NG_TAG "2.0.5")
93+
set(ZLIB-NG_TAG "2.3.2")
9494
set(ZLIB-NG_REPOSITORY "https://github.com/zlib-ng/zlib-ng.git")
9595

9696
#////////////////////////////////////#
9797
# IXWebSocket #
9898
#////////////////////////////////////#
99-
set(IXWEBSOCKET_TAG "v11.4.4")
100-
set(IXWEBSOCKET_REPOSITORY "https://github.com/machinezone/IXWebSocket.git")
99+
set(IXWEBSOCKET_TAG "v11.4.6")
100+
set(IXWEBSOCKET_REPOSITORY "https://gitlab.com/external-packages/ixwebsocket.git")
101101

102102
#////////////////////////////////////#
103103
# FlakedTuna #
@@ -108,20 +108,20 @@ set(FLAKEDTUNA_REPOSITORY "https://github.com/flagarde/FlakedTuna.git")
108108
#////////////////////////////////////#
109109
# Fmt #
110110
#////////////////////////////////////#
111-
set(FMT_TAG "8.0.1")
112-
set(FMT_REPOSITORY "https://github.com/fmtlib/fmt.git")
111+
set(FMT_TAG "12.1.0")
112+
set(FMT_REPOSITORY "https://gitlab.com/external-packages/fmt.git")
113113

114114
#////////////////////////////////////#
115115
# Spdlog #
116116
#////////////////////////////////////#
117-
set(SPDLOG_TAG "v1.9.1")
118-
set(SPDLOG_REPOSITORY "https://github.com/gabime/spdlog.git")
117+
set(SPDLOG_TAG "v1.17.0")
118+
set(SPDLOG_REPOSITORY "https://gitlab.com/external-packages/spdlog.git")
119119

120120
#////////////////////////////////////#
121121
# magic_enum #
122122
#////////////////////////////////////#
123-
set(MAGIC_ENUM_TAG "v0.7.3")
124-
set(MAGIC_ENUM_REPOSITORY "https://github.com/Neargye/magic_enum.git")
123+
set(MAGIC_ENUM_TAG "v0.9.7")
124+
set(MAGIC_ENUM_REPOSITORY "https://gitlab.com/external-packages/magic-enum.git")
125125

126126
#////////////////////////////////////#
127127
# Jsoncpp #
@@ -133,8 +133,8 @@ set(JSONCPP_REPOSITORY "https://github.com/open-source-parsers/jsoncpp.git")
133133
#////////////////////////////////////#
134134
# nlohmann #
135135
#////////////////////////////////////#
136-
set(NLOHMANN_TAG "v3.10.4")
137-
set(NLOHMANN_REPOSITORY "https://github.com/ArthurSonzogni/nlohmann_json_cmake_fetchcontent.git")
136+
set(NLOHMANN_TAG "v3.12.0")
137+
set(NLOHMANN_REPOSITORY "https://gitlab.com/external-packages/json.git")
138138

139139
#////////////////////////////////////#
140140
# json-rpc-cxx #
@@ -145,20 +145,20 @@ set(JSON_RPC_CXX_REPOSITORY "https://github.com/jsonrpcx/json-rpc-cxx.git")
145145
#////////////////////////////////////#
146146
# Toml11 #
147147
#////////////////////////////////////#
148-
set(TOML11_TAG "v3.8.1")
149-
set(TOML11_REPOSITORY "https://github.com/ToruNiina/toml11.git")
148+
set(TOML11_TAG "v4.4.0")
149+
set(TOML11_REPOSITORY "https://gitlab.com/external-packages/toml11.git")
150150

151151
#////////////////////////////////////#
152152
# dotenv-cpp #
153153
#////////////////////////////////////#
154154
set(DOTENV_TAG "master")
155-
set(DOTENV_REPOSITORY "https://github.com/flagarde/dotenv-cpp.git")
155+
set(DOTENV_REPOSITORY "https://gitlab.com/external-packages/dotenv-cpp.git")
156156

157157
#////////////////////////////////////#
158158
# source_location #
159159
#////////////////////////////////////#
160160
set(SOURCELOCATION_TAG "main")
161-
set(SOURCELOCATION_REPOSITORY "https://github.com/flagarde/source_location.git")
161+
set(SOURCELOCATION_REPOSITORY "https://gitlab.com/external-packages/source-location.git")
162162

163163
######################################
164164
# EXTRA PACKAGES #
@@ -173,14 +173,14 @@ set(ELOGPP_REPOSITORY "https://github.com/flagarde/elogpp.git")
173173
#////////////////////////////////////#
174174
# CAENlibs #
175175
#////////////////////////////////////#
176-
set(CAENLIBS_REPOSITORY "https://github.com/flagarde/CAENlibs.git")
176+
set(CAENLIBS_REPOSITORY "https://gitlab.com/flagarde/CAENlibs.git")
177177
set(CAENLIBS_TAG "main")
178178

179179
#////////////////////////////////////#
180180
# soci #
181181
#////////////////////////////////////#
182182
set(SOCI_TAG "master")
183-
set(SOCI_REPOSITORY "https://github.com/SOCI/soci.git")
183+
set(SOCI_REPOSITORY "https://gitlab.com/external-packages/soci.git")
184184

185185
#////////////////////////////////////#
186186
# net-snmp #

‎apps/Controller.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
#include "CLI/CLI.hpp"
44
#include "ProgramInfos.hpp"
5-
#include "magic_enum.hpp"
5+
#include "magic_enum/magic_enum.hpp"
66

77
#include "linenoise.hpp"
88

0 commit comments

Comments
 (0)