Skip to content

Commit 195b5a6

Browse files
committed
Configured the project to build and link properly using MSVC 2012 on Windows 7.
1 parent 8a48c83 commit 195b5a6

File tree

1 file changed

+13
-4
lines changed

1 file changed

+13
-4
lines changed

CMakeLists.txt

+13-4
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,14 @@ find_package( OpenSSL )
3333
find_package( Threads )
3434
set(CMAKE_VERBOSE_MAKEFILE true)
3535

36-
if (CMAKE_BUILD_TYPE MATCHES Debug)
37-
add_definitions(-DNETWORK_DEBUG)
36+
if(CMAKE_BUILD_TYPE MATCHES Debug)
37+
add_definitions(-DNETWORK_DEBUG)
3838
endif()
3939

40+
41+
4042
if (OPENSSL_FOUND)
41-
add_definitions(-DNETWORK_ENABLE_HTTPS)
43+
add_definitions(-DNETWORK_ENABLE_HTTPS)
4244
endif()
4345

4446
if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
@@ -77,12 +79,13 @@ if (Boost_FOUND)
7779
include_directories(${Boost_INCLUDE_DIRS})
7880
endif(Boost_FOUND)
7981

80-
message(STATUS "CPP-NETLIB Options selected:")
82+
message(STATUS "CPP-NETLIB options selected:")
8183
message(STATUS " CPP-NETLIB_BUILD_SHARED_LIBS: ${CPP-NETLIB_BUILD_SHARED_LIBS}\t(Build cpp-netlib as shared libraries: OFF, ON)")
8284
message(STATUS " CPP-NETLIB_BUILD_TESTS: ${CPP-NETLIB_BUILD_TESTS}\t(Build the unit tests: ON, OFF)")
8385
message(STATUS " CPP-NETLIB_BUILD_EXAMPLES: ${CPP-NETLIB_BUILD_EXAMPLES}\t(Build the examples using cpp-netlib: ON, OFF)")
8486
message(STATUS " CPP-NETLIB_ALWAYS_LOGGING: ${CPP-NETLIB_ALWAYS_LOGGING}\t(Allow cpp-netlib to log debug messages even in non-debug mode: ON, OFF)")
8587
message(STATUS " CPP-NETLIB_DISABLE_LOGGING: ${CPP-NETLIB_DISABLE_LOGGING}\t(Disable logging definitely, no logging code will be generated or compiled: ON, OFF)")
88+
message(STATUS "CMake build options selected:")
8689

8790
############################################################################
8891
#
@@ -91,6 +94,12 @@ message(STATUS " CPP-NETLIB_DISABLE_LOGGING: ${CPP-NETLIB_DISABLE_LOGGING}\t(
9194

9295
if(CPP-NETLIB_BUILD_TESTS)
9396
enable_testing()
97+
if(MSVC11)
98+
add_definitions(-D_VARIADIC_MAX=10)
99+
endif(MSVC11)
100+
if(MSVC)
101+
set(gtest_force_shared_crt ON CACHE BOOL "Override gtest option.")
102+
endif(MSVC)
94103
add_subdirectory(deps/gtest)
95104
set(GTEST_ROOT ${CPP-NETLIB_SOURCE_DIR}/deps/gtest)
96105
set(GTEST_FOUND ON)

0 commit comments

Comments
 (0)