Commit062fa39

committed

Change to CMake configuration to build library + examples + tests with MSVC2015. Some tests do not pass, though.

1 parent6a7e92c commit062fa39Copy full SHA for 062fa39

File tree

-4

lines changed

-4

lines changed

Lines changed: 6 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -100,6 +100,11 @@ elseif (${CMAKE_CXX_COMPILER_ID} MATCHES Clang)`
`100`	`100`	`endif()`
`101`	`101`
`102`	`102`
	`103`	`+if (MSVC)`
	`104`	`+set(CMAKE_CXX_FLAGS"${CMAKE_CXX_FLAGS} /bigobj")`
	`105`	`+set(gtest_force_shared_crttrue)`
	`106`	`+endif()`
	`107`	`+`
`103`	`108`	`if (Boost_FOUND)`
`104`	`109`	`if (MSVC)`
`105`	`110`	`add_definitions(-D_SCL_SECURE_NO_WARNINGS)`
`@@ -108,6 +113,7 @@ if (Boost_FOUND)`
`108`	`113`	`add_definitions(-D_WIN32_WINNT=0x0501)`
`109`	`114`	`endif(WIN32)`
`110`	`115`	`include_directories(${Boost_INCLUDE_DIRS})`
	`116`	`+link_directories(${Boost_LIBRARY_DIRS})`
`111`	`117`
`112`	`118`	`enable_testing()`
`113`	`119`	`add_subdirectory(libs/network/src)`
`@@ -120,10 +126,6 @@ if (Boost_FOUND)`
`120`	`126`	`endif (CPP-NETLIB_BUILD_EXAMPLES)`
`121`	`127`	`endif(Boost_FOUND)`
`122`	`128`
`123`		`-if (MSVC)`
`124`		`-set(CMAKE_CXX_FLAGS"${CMAKE_CXX_FLAGS} /bigobj")`
`125`		`-endif()`
`126`		`-`
`127`	`129`	`enable_testing()`
`128`	`130`
`129`	`131`	`set(CPP-NETLIB_LIBRARIES${Boost_LIBRARIES}CACHEINTERNAL"Dependent libraries for header-only use")`

Comments

(0)