mirror of
https://github.com/jbeder/yaml-cpp.git
synced 2025-09-09 20:51:16 +00:00
Compare commits
2 Commits
0.8.0
...
revert-104
Author | SHA1 | Date | |
---|---|---|---|
![]() |
e1e6344a21 | ||
![]() |
317d6d3ce4 |
@@ -14,11 +14,6 @@ include(CMakeDependentOption)
|
|||||||
include(CheckCXXCompilerFlag)
|
include(CheckCXXCompilerFlag)
|
||||||
include(GNUInstallDirs)
|
include(GNUInstallDirs)
|
||||||
include(CTest)
|
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)
|
find_program(YAML_CPP_CLANG_FORMAT_EXE NAMES clang-format)
|
||||||
|
|
||||||
@@ -86,7 +81,6 @@ set_property(TARGET yaml-cpp
|
|||||||
target_include_directories(yaml-cpp
|
target_include_directories(yaml-cpp
|
||||||
PUBLIC
|
PUBLIC
|
||||||
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
|
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
|
||||||
$<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/include>
|
|
||||||
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
|
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
|
||||||
PRIVATE
|
PRIVATE
|
||||||
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src>)
|
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src>)
|
||||||
@@ -142,12 +136,6 @@ write_basic_package_version_file(
|
|||||||
"${PROJECT_BINARY_DIR}/yaml-cpp-config-version.cmake"
|
"${PROJECT_BINARY_DIR}/yaml-cpp-config-version.cmake"
|
||||||
COMPATIBILITY AnyNewerVersion)
|
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)
|
configure_file(yaml-cpp.pc.in yaml-cpp.pc @ONLY)
|
||||||
|
|
||||||
if (YAML_CPP_INSTALL)
|
if (YAML_CPP_INSTALL)
|
||||||
@@ -157,9 +145,6 @@ if (YAML_CPP_INSTALL)
|
|||||||
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||||
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
||||||
install(DIRECTORY ${PROJECT_SOURCE_DIR}/include/
|
install(DIRECTORY ${PROJECT_SOURCE_DIR}/include/
|
||||||
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
|
|
||||||
FILES_MATCHING PATTERN "*.h")
|
|
||||||
install(DIRECTORY ${PROJECT_BINARY_DIR}/include/
|
|
||||||
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
|
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
|
||||||
FILES_MATCHING PATTERN "*.h")
|
FILES_MATCHING PATTERN "*.h")
|
||||||
install(EXPORT yaml-cpp-targets
|
install(EXPORT yaml-cpp-targets
|
||||||
|
33
include/yaml-cpp/dll.h
Normal file
33
include/yaml-cpp/dll.h
Normal file
@@ -0,0 +1,33 @@
|
|||||||
|
#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
|
Reference in New Issue
Block a user