Skip to content

Commit 6686ebd

Browse files
committed
Added network::uri to the project.
1 parent ae4c037 commit 6686ebd

File tree

2 files changed

+10
-9
lines changed

2 files changed

+10
-9
lines changed

CMakeLists.txt

+9-8
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ project(CPP-NETLIB)
99

1010
option( CPP-NETLIB_BUILD_SHARED_LIBS "Build cpp-netlib as shared libraries." OFF )
1111
option( CPP-NETLIB_BUILD_TESTS "Build the cpp-netlib project tests." ON)
12-
# option( CPP-NETLIB_BUILD_EXPERIMENTS "Build the cpp-netlib project experiments." ON)
1312
option( CPP-NETLIB_BUILD_EXAMPLES "Build the cpp-netlib project examples." ON)
1413
option( CPP-NETLIB_ENABLE_HTTPS "Build cpp-netlib with support for https if OpenSSL is found." ON)
1514

@@ -49,7 +48,7 @@ set(Boost_USE_MULTI_THREADED ON)
4948
find_package(Boost 1.57.0 REQUIRED)
5049

5150
if (CPP-NETLIB_ENABLE_HTTPS)
52-
find_package( OpenSSL )
51+
find_package( OpenSSL )
5352
endif()
5453

5554
find_package( Threads )
@@ -83,6 +82,13 @@ elseif (${CMAKE_CXX_COMPILER_ID} MATCHES Clang)
8382
endif()
8483
endif()
8584

85+
if (NOT MSVC)
86+
set(Uri_BUILD_TESTS OFF)
87+
set(Uri_BUILD_DOCS OFF)
88+
set(Uri_DISABLE_LIBCXX ON)
89+
add_subdirectory(deps/uri)
90+
include_directories(deps/uri/include)
91+
endif()
8692

8793
if (Boost_FOUND)
8894
if (MSVC)
@@ -102,13 +108,8 @@ if (Boost_FOUND)
102108
if (CPP-NETLIB_BUILD_TESTS)
103109
add_subdirectory(deps/googletest)
104110
add_subdirectory(libs/network/test)
111+
add_subdirectory(deps/uri/test)
105112
endif (CPP-NETLIB_BUILD_TESTS)
106-
# if (CPP-NETLIB_BUILD_EXPERIMENTS)
107-
# add_subdirectory(libs/network/experiment)
108-
# endif (CPP-NETLIB_BUILD_EXPERIMENTS)
109-
# if (NOT MSVC AND CPP-NETLIB_BUILD_TESTS)
110-
# add_subdirectory(libs/mime/test)
111-
# endif(NOT MSVC AND CPP-NETLIB_BUILD_TESTS)
112113
if (CPP-NETLIB_BUILD_EXAMPLES)
113114
add_subdirectory(libs/network/example)
114115
endif (CPP-NETLIB_BUILD_EXAMPLES)

deps/uri

Submodule uri updated 3523 files

0 commit comments

Comments
 (0)