External/yaml-cpp
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add missing DLL export, and set up gtest/gmock to properly import their symbols.

Browse Source
This commit is contained in:
Jesse Beder 2014-03-23 23:56:17 -05:00
parent 833f2996bc
commit fe8ca77a1b
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/yaml-cpp/ostream_wrapper.h
View File

@ -10,8 +10,10 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include "yaml-cpp/dll.h"
namespace YAML { namespace YAML {
class ostream_wrapper { class YAML_CPP_API ostream_wrapper {
public: public:
ostream_wrapper(); ostream_wrapper();
explicit ostream_wrapper(std::ostream& stream); explicit ostream_wrapper(std::ostream& stream);

4
test/CMakeLists.txt
View File

@ -4,6 +4,10 @@ add_subdirectory(gmock-1.7.0)
include_directories(gmock-1.7.0/gtest/include) include_directories(gmock-1.7.0/gtest/include)
include_directories(gmock-1.7.0/include) include_directories(gmock-1.7.0/include)
if(WIN32 AND BUILD_SHARED_LIBS)
add_definitions("-DGTEST_LINKED_AS_SHARED_LIBRARY")
endif()
file(GLOB test_headers [a-z_]*.h) file(GLOB test_headers [a-z_]*.h)
file(GLOB test_sources [a-z_]*.cpp integration/[a-z_]*.cpp) file(GLOB test_sources [a-z_]*.cpp integration/[a-z_]*.cpp)
file(GLOB test_core_sources core/[a-z]*.cpp) file(GLOB test_core_sources core/[a-z]*.cpp)