Skip to content

Commit 1951a4b

Browse files
committed
Rm conan from cmake
1 parent fea7537 commit 1951a4b

File tree

5 files changed

+338
-12
lines changed

5 files changed

+338
-12
lines changed

sprint4/problems/leave_game/solution/CMakeLists.txt

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,10 @@ project(game_server CXX)
44
set(CMAKE_CXX_STANDARD 20)
55
set(CXX_STANDARD_REQUIRED ON)
66

7-
include(${CMAKE_BINARY_DIR}/conanbuildinfo_multi.cmake)
8-
conan_basic_setup(TARGETS)
7+
# include(${CMAKE_BINARY_DIR}/conanbuildinfo_multi.cmake)
8+
# conan_basic_setup(TARGETS)
99

10-
# Указываем путь к заголовкам
11-
# include_directories(/usr/include/pqxx)
12-
13-
# # Ищем библиотеку
14-
# find_library(PQXX_LIB pqxx REQUIRED HINTS /usr/lib/aarch64-linux-gnu)
10+
find_package(Boost 1.78.0 REQUIRED system serialization log log_setup program_options)
1511

1612
find_package(PkgConfig REQUIRED)
1713
pkg_check_modules(PQXX REQUIRED libpqxx)
@@ -71,9 +67,12 @@ add_executable(game_server
7167
src/database_manager.cpp
7268
)
7369

74-
target_link_libraries(game_server
75-
CONAN_PKG::boost
76-
# ${PQXX_LIB}
70+
target_link_libraries(game_server
71+
${Boost_include_dir}
72+
Boost::serialization
73+
Boost::log
74+
Boost::log_setup
75+
Boost::program_options
7776
${PQXX_LIBRARIES}
7877
${PQ_LIB}
79-
)
78+
)

sprint4/problems/leave_game/solution/conanfile.txt

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

77
[options]
88
boost:header_only=True
9+
boost:without_log=False
10+
boost:without_serialization=False

0 commit comments

Comments
 (0)