Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Y
yaml-cpp
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lvzhengyang
yaml-cpp
Commits
0733aeb4
Unverified
Commit
0733aeb4
authored
Oct 10, 2021
by
Pino Toscano
Committed by
GitHub
Oct 09, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Revert "Hide most of non-public symbols by default (#984)" (#1038)" (#1045)
parent
0d9dbcfe
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
34 deletions
+16
-34
CMakeLists.txt
+15
-0
include/yaml-cpp/dll.h
+0
-33
src/node_data.cpp
+1
-1
No files found.
CMakeLists.txt
View file @
0733aeb4
...
...
@@ -14,6 +14,11 @@ include(CMakeDependentOption)
include
(
CheckCXXCompilerFlag
)
include
(
GNUInstallDirs
)
include
(
CTest
)
include
(
GenerateExportHeader
)
set
(
CMAKE_C_VISIBILITY_PRESET hidden
)
set
(
CMAKE_CXX_VISIBILITY_PRESET hidden
)
set
(
CMAKE_VISIBILITY_INLINES_HIDDEN 1
)
find_program
(
YAML_CPP_CLANG_FORMAT_EXE NAMES clang-format
)
...
...
@@ -81,6 +86,7 @@ set_property(TARGET yaml-cpp
target_include_directories
(
yaml-cpp
PUBLIC
$<BUILD_INTERFACE:
${
PROJECT_SOURCE_DIR
}
/include>
$<BUILD_INTERFACE:
${
PROJECT_BINARY_DIR
}
/include>
$<INSTALL_INTERFACE:
${
CMAKE_INSTALL_INCLUDEDIR
}
>
PRIVATE
$<BUILD_INTERFACE:
${
PROJECT_SOURCE_DIR
}
/src>
)
...
...
@@ -136,6 +142,12 @@ write_basic_package_version_file(
"
${
PROJECT_BINARY_DIR
}
/yaml-cpp-config-version.cmake"
COMPATIBILITY AnyNewerVersion
)
generate_export_header
(
yaml-cpp
BASE_NAME YAML_CPP
EXPORT_FILE_NAME
"
${
PROJECT_BINARY_DIR
}
/include/yaml-cpp/dll.h"
EXPORT_MACRO_NAME YAML_CPP_API
)
configure_file
(
yaml-cpp.pc.in yaml-cpp.pc @ONLY
)
if
(
YAML_CPP_INSTALL
)
...
...
@@ -147,6 +159,9 @@ if (YAML_CPP_INSTALL)
install
(
DIRECTORY
${
PROJECT_SOURCE_DIR
}
/include/
DESTINATION
${
CMAKE_INSTALL_INCLUDEDIR
}
FILES_MATCHING PATTERN
"*.h"
)
install
(
DIRECTORY
${
PROJECT_BINARY_DIR
}
/include/
DESTINATION
${
CMAKE_INSTALL_INCLUDEDIR
}
FILES_MATCHING PATTERN
"*.h"
)
install
(
EXPORT yaml-cpp-targets
DESTINATION
"
${
CMAKE_INSTALL_DATADIR
}
/cmake/yaml-cpp"
)
install
(
FILES
...
...
include/yaml-cpp/dll.h
deleted
100644 → 0
View file @
0d9dbcfe
#ifndef DLL_H_62B23520_7C8E_11DE_8A39_0800200C9A66
#define DLL_H_62B23520_7C8E_11DE_8A39_0800200C9A66
#if defined(_MSC_VER) || \
(defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || \
(__GNUC__ >= 4)) // GCC supports "pragma once" correctly since 3.4
#pragma once
#endif
// The following ifdef block is the standard way of creating macros which make
// exporting from a DLL simpler. All files within this DLL are compiled with the
// yaml_cpp_EXPORTS symbol defined on the command line. This symbol should not
// be defined on any project that uses this DLL. This way any other project
// whose source files include this file see YAML_CPP_API functions as being
// imported from a DLL, whereas this DLL sees symbols defined with this macro as
// being exported.
#undef YAML_CPP_API
#ifdef YAML_CPP_DLL // Using or Building YAML-CPP DLL (definition defined
// manually)
#ifdef yaml_cpp_EXPORTS // Building YAML-CPP DLL (definition created by CMake
// or defined manually)
// #pragma message( "Defining YAML_CPP_API for DLL export" )
#define YAML_CPP_API __declspec(dllexport)
#else // yaml_cpp_EXPORTS
// #pragma message( "Defining YAML_CPP_API for DLL import" )
#define YAML_CPP_API __declspec(dllimport)
#endif // yaml_cpp_EXPORTS
#else // YAML_CPP_DLL
#define YAML_CPP_API
#endif // YAML_CPP_DLL
#endif // DLL_H_62B23520_7C8E_11DE_8A39_0800200C9A66
src/node_data.cpp
View file @
0733aeb4
...
...
@@ -13,7 +13,7 @@
namespace
YAML
{
namespace
detail
{
std
::
atomic
<
size_t
>
node
::
m_amount
{
0
};
YAML_CPP_API
std
::
atomic
<
size_t
>
node
::
m_amount
{
0
};
const
std
::
string
&
node_data
::
empty_scalar
()
{
static
const
std
::
string
svalue
;
...
...
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