Skip to content

Commit 8ce3074

Browse files
committed
fix: CI issue
Signed-off-by: Dmitriy Khaustov aka xDimon <khaustov.dm@gmail.com>
1 parent 177e7a0 commit 8ce3074

5 files changed

Lines changed: 30 additions & 15 deletions

File tree

CMakeLists.txt

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ endif ()
1313

1414
set(CMAKE_CXX_STANDARD 20)
1515
set(CMAKE_CXX_STANDARD_REQUIRED ON)
16-
set(CMAKE_CXX_EXTENSIONS OFF)
16+
set(CMAKE_CXX_EXTENSIONS ON)
1717
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
1818
set(CMAKE_EXPERIMENTAL_CXX_MODULE_CMAKE_API ON)
1919

@@ -77,11 +77,12 @@ find_package(qtils CONFIG REQUIRED)
7777
find_package(prometheus-cpp CONFIG REQUIRED)
7878
find_package(RocksDB CONFIG REQUIRED)
7979

80-
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
81-
add_compile_options(-fmodules-ts)
82-
elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang|AppleClang")
83-
add_compile_options(-fmodules)
84-
endif()
80+
# TODO Temporarily commented out until gcc is updated (gcc-13 crashes because of this).
81+
# if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
82+
# add_compile_options(-fmodules-ts)
83+
# elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang|AppleClang")
84+
# add_compile_options(-fmodules)
85+
# endif()
8586

8687
add_library(headers INTERFACE)
8788
target_include_directories(headers INTERFACE

src/app/CMakeLists.txt

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,34 +26,47 @@ add_library(build_version
2626
${CMAKE_BINARY_DIR}/generated/app/build_version.cpp
2727
)
2828

29-
add_library(app_configuration SHARED configuration.cpp)
29+
add_library(app_configuration SHARED
30+
configuration.cpp
31+
)
3032
target_link_libraries(app_configuration
3133
Boost::boost
3234
fmt::fmt
3335
)
3436

35-
add_library(app_configurator SHARED configurator.cpp)
37+
add_library(app_configurator SHARED
38+
configurator.cpp
39+
)
3640
target_link_libraries(app_configurator
3741
app_configuration
3842
yaml-cpp::yaml-cpp
3943
Boost::program_options
4044
build_version
4145
)
4246

43-
add_library(app_state_manager SHARED impl/state_manager_impl.cpp)
47+
add_library(app_state_manager SHARED
48+
impl/state_manager_impl.cpp
49+
)
4450
target_link_libraries(app_state_manager
4551
qtils::qtils
4652
logger
4753
)
4854

49-
add_library(chain_spec SHARED impl/chain_spec_impl.cpp)
55+
add_library(chain_spec SHARED
56+
impl/chain_spec_impl.cpp
57+
)
5058
target_link_libraries(chain_spec
5159
logger
5260
Boost::property_tree
5361
app_configuration
5462
)
63+
add_dependencies(chain_spec
64+
generate_common_types
65+
)
5566

56-
add_library(application SHARED impl/application_impl.cpp)
67+
add_library(application SHARED
68+
impl/application_impl.cpp
69+
)
5770
target_link_libraries(application
5871
qtils::qtils
5972
app_configuration

src/app/impl/chain_spec_impl.hpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66

77
#pragma once
88

9+
#include <filesystem>
10+
911
#include <boost/property_tree/json_parser.hpp>
1012
#include <qtils/enum_error_code.hpp>
1113

tests/testutil/storage/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ add_library(base_fs_test
1111
target_link_libraries(base_fs_test
1212
GTest::gtest
1313
app_configuration
14+
logger_for_tests
1415
)
1516

1617
add_library(base_rocksdb_test
@@ -19,6 +20,7 @@ add_library(base_rocksdb_test
1920
)
2021
target_link_libraries(base_rocksdb_test
2122
base_fs_test
23+
storage
2224
)
2325

2426
add_library(std_list_adapter INTERFACE)

tests/unit/storage/rocksdb/CMakeLists.txt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,13 @@ addtest(rocksdb_fs_test
88
rocksdb_fs_test.cpp
99
)
1010
target_link_libraries(rocksdb_fs_test
11-
storage
1211
base_fs_test
13-
logger_for_tests
12+
storage
1413
)
1514

1615
addtest(rocksdb_integration_test
1716
rocksdb_integration_test.cpp
1817
)
1918
target_link_libraries(rocksdb_integration_test
20-
storage
2119
base_rocksdb_test
22-
logger_for_tests
2320
)

0 commit comments

Comments
 (0)