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

Maintain cmake compatibility with ubuntu 22 #9

Merged
merged 1 commit into from
Nov 23, 2023
Merged

Maintain cmake compatibility with ubuntu 22 #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON)
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)

option(ULS_WITH_TESTS "ULS Unit Tests" ON)
option(ULS_WITH_WERROR "Enable warnings as errors" ON)
option(ULS_WITH_WERROR "Enable warnings as errors" OFF)

#Hack used to force UTAP to compile statically
set(BUILD_SHARED_LIBS OFF)
Expand Down
10 changes: 2 additions & 8 deletions cmake/nlohmann.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,7 @@
include(FetchContent)

FetchContent_Declare(json
URL https://github.com/nlohmann/json/releases/download/v3.11.2/json.tar.xz
DOWNLOAD_EXTRACT_TIMESTAMP ON
URL https://github.com/nlohmann/json/releases/download/v3.11.2/json.tar.xz
)

# Manually make available so we can mark library as SYSTEM headers thus disabling warnings
FetchContent_GetProperties(json)
if(NOT json_POPULATED)
FetchContent_Populate(json)
add_subdirectory(${json_SOURCE_DIR} ${json_BINARY_DIR} SYSTEM)
endif()
FetchContent_MakeAvailable(json)
1 change: 0 additions & 1 deletion src/server.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#include <uls/server.h>
#include <nlohmann/json.hpp>
#include <iostream>
#include <thread>
#include <chrono>
Expand Down