From 9e8598fb1ca359143600d6bb2e8b317126a86bcc Mon Sep 17 00:00:00 2001 From: Tiger Wang Date: Sat, 16 May 2020 20:59:10 +0100 Subject: Upgrade to C++17 [CMake] (#4717) * Make our CMake slightly less insane --- src/Protocol/CMakeLists.txt | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'src/Protocol') diff --git a/src/Protocol/CMakeLists.txt b/src/Protocol/CMakeLists.txt index 0f22e531f..e197853cb 100644 --- a/src/Protocol/CMakeLists.txt +++ b/src/Protocol/CMakeLists.txt @@ -1,6 +1,6 @@ -include_directories (SYSTEM "../../lib/jsoncpp/include") +target_sources( + ${CMAKE_PROJECT_NAME} PRIVATE -SET (SRCS Authenticator.cpp ChunkDataSerializer.cpp ForgeHandshake.cpp @@ -14,9 +14,7 @@ SET (SRCS Protocol_1_13.cpp ProtocolPalettes.cpp ProtocolRecognizer.cpp -) -SET (HDRS Authenticator.h ChunkDataSerializer.h ForgeHandshake.h @@ -32,8 +30,3 @@ SET (HDRS ProtocolPalettes.h ProtocolRecognizer.h ) - -if (NOT MSVC) - add_library(Protocol ${SRCS} ${HDRS}) - target_link_libraries(Protocol fmt::fmt SQLiteCpp) -endif() -- cgit v1.2.3