Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
gaoqiong
yaml-cpp
Commits
fe8ca77a
Commit
fe8ca77a
authored
Mar 23, 2014
by
Jesse Beder
Browse files
Add missing DLL export, and set up gtest/gmock to properly import their symbols.
parent
833f2996
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
1 deletion
+7
-1
include/yaml-cpp/ostream_wrapper.h
include/yaml-cpp/ostream_wrapper.h
+3
-1
test/CMakeLists.txt
test/CMakeLists.txt
+4
-0
No files found.
include/yaml-cpp/ostream_wrapper.h
View file @
fe8ca77a
...
@@ -10,8 +10,10 @@
...
@@ -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
);
...
...
test/CMakeLists.txt
View file @
fe8ca77a
...
@@ -4,6 +4,10 @@ add_subdirectory(gmock-1.7.0)
...
@@ -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
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment