Fix build errors in VS2019
This commit is contained in:
parent
80e04b36ab
commit
18f829d03d
|
@ -102,9 +102,13 @@ include_directories(SYSTEM "lib/tclap-1.2.1/include")
|
||||||
|
|
||||||
# ... Google Test
|
# ... Google Test
|
||||||
add_subdirectory("lib/googletest")
|
add_subdirectory("lib/googletest")
|
||||||
|
target_compile_options(gmock PRIVATE ${disableWarningsFlags})
|
||||||
set_target_properties(gmock PROPERTIES FOLDER lib)
|
set_target_properties(gmock PROPERTIES FOLDER lib)
|
||||||
|
target_compile_options(gmock_main PRIVATE ${disableWarningsFlags})
|
||||||
set_target_properties(gmock_main PROPERTIES FOLDER lib)
|
set_target_properties(gmock_main PROPERTIES FOLDER lib)
|
||||||
|
target_compile_options(gtest PRIVATE ${disableWarningsFlags})
|
||||||
set_target_properties(gtest PROPERTIES FOLDER lib)
|
set_target_properties(gtest PROPERTIES FOLDER lib)
|
||||||
|
target_compile_options(gtest_main PRIVATE ${disableWarningsFlags})
|
||||||
set_target_properties(gtest_main PROPERTIES FOLDER lib)
|
set_target_properties(gtest_main PROPERTIES FOLDER lib)
|
||||||
|
|
||||||
# ... GSL
|
# ... GSL
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
|
|
||||||
#include <memory>
|
#include <memory>
|
||||||
#include <mutex>
|
#include <mutex>
|
||||||
|
#include <functional>
|
||||||
|
|
||||||
// Class template for lazy initialization.
|
// Class template for lazy initialization.
|
||||||
// Copies use reference semantics.
|
// Copies use reference semantics.
|
||||||
|
|
|
@ -4,6 +4,7 @@
|
||||||
#include <memory>
|
#include <memory>
|
||||||
#include <chrono>
|
#include <chrono>
|
||||||
#include <deque>
|
#include <deque>
|
||||||
|
#include <string>
|
||||||
|
|
||||||
#define UNUSED(x) ((void)(x))
|
#define UNUSED(x) ((void)(x))
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue