From 3e7ef74a07931f4f088bb40500bc7d0dd50e15c7 Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Fri, 25 Nov 2016 08:25:09 +0000 Subject: [PATCH] enh: Set GFLAGS_IS_A_DLL in INTERFACE_COMPILE_DEFINITIONS --- CMakeLists.txt | 36 ++++++++++++++++++------------------ src/config.h.in | 5 ----- src/gflags_declare.h.in | 17 +++++++++++++---- 3 files changed, 31 insertions(+), 27 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 15582cf..b1e514d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -368,8 +368,10 @@ if (NOT DEFINED GFLAGS_ATTRIBUTE_UNUSED) endif () # whenever we build a shared library (DLL on Windows), configure the public -# headers of the API for use of this library rather than the optionally +# headers of the API for use of this shared library rather than the optionally # also build statically linked library; users can override GFLAGS_DLL_DECL +# in particular, this done by setting the INTERFACE_COMPILE_DEFINITIONS of +# static libraries to include an empty definition for GFLAGS_DLL_DECL if (NOT DEFINED GFLAGS_IS_A_DLL) if (BUILD_SHARED_LIBS) set (GFLAGS_IS_A_DLL 1) @@ -433,39 +435,37 @@ foreach (TYPE IN ITEMS STATIC SHARED) # multi-threaded vs. single-threaded foreach (opts IN ITEMS "" _nothreads) if (BUILD_gflags${opts}_LIB) - add_library (gflags${opts}_${type} ${TYPE} ${GFLAGS_SRCS} ${PRIVATE_HDRS} ${PUBLIC_HDRS}) + set (target_name "gflags${opts}_${type}") + add_library (${target_name} ${TYPE} ${GFLAGS_SRCS} ${PRIVATE_HDRS} ${PUBLIC_HDRS}) + set_target_properties (${target_name} PROPERTIES + OUTPUT_NAME "gflags${opts}${type_suffix}" + VERSION "${PACKAGE_VERSION}" + SOVERSION "${PACKAGE_SOVERSION}" + ) set (include_dirs "$") if (INSTALL_HEADERS) list (APPEND include_dirs "$") endif () - target_include_directories (gflags${opts}_${type} + target_include_directories (${target_name} PUBLIC "${include_dirs}" PRIVATE "${PROJECT_SOURCE_DIR}/src;${PROJECT_BINARY_DIR}/include/${GFLAGS_INCLUDE_DIR}" ) + target_compile_definitions (${target_name} PUBLIC GFLAGS_IS_A_DLL=${GFLAGS_IS_A_DLL}) if (opts MATCHES "nothreads") - set (defines "GFLAGS_IS_A_DLL=${GFLAGS_IS_A_DLL};NO_THREADS") - else () - set (defines "GFLAGS_IS_A_DLL=${GFLAGS_IS_A_DLL}") - if (CMAKE_USE_PTHREADS_INIT) - target_link_libraries (gflags${opts}_${type} ${CMAKE_THREAD_LIBS_INIT}) - endif () + target_compile_definitions (${target_name} PRIVATE NO_THREADS) + elseif (CMAKE_USE_PTHREADS_INIT) + target_link_libraries (${target_name} ${CMAKE_THREAD_LIBS_INIT}) endif () - set_target_properties ( - gflags${opts}_${type} PROPERTIES COMPILE_DEFINITIONS "${defines}" - OUTPUT_NAME "gflags${opts}${type_suffix}" - VERSION "${PACKAGE_VERSION}" - SOVERSION "${PACKAGE_SOVERSION}" - ) if (HAVE_SHLWAPI_H) - target_link_libraries (gflags${opts}_${type} shlwapi.lib) + target_link_libraries (${target_name} shlwapi.lib) endif () - list (APPEND TARGETS gflags${opts}_${type}) + list (APPEND TARGETS ${target_name}) # add convenience make target for build of both shared and static libraries if (NOT GFLAGS_IS_SUBPROJECT) if (NOT TARGET gflags${opts}) add_custom_target (gflags${opts}) endif () - add_dependencies (gflags${opts} gflags${opts}_${type}) + add_dependencies (gflags${opts} ${target_name}) endif () endif () endforeach () diff --git a/src/config.h.in b/src/config.h.in index ee92210..f6d18d8 100644 --- a/src/config.h.in +++ b/src/config.h.in @@ -87,11 +87,6 @@ // --------------------------------------------------------------------------- // Windows -// Whether gflags library is a DLL. -#ifndef GFLAGS_IS_A_DLL -# define GFLAGS_IS_A_DLL 0 -#endif - // Always export symbols when compiling a shared library as this file is only // included by internal modules when building the gflags library itself. // The gflags_declare.h header file will set it to import these symbols otherwise. diff --git a/src/gflags_declare.h.in b/src/gflags_declare.h.in index 5e01198..508d46b 100644 --- a/src/gflags_declare.h.in +++ b/src/gflags_declare.h.in @@ -45,18 +45,27 @@ // --------------------------------------------------------------------------- // Windows DLL import/export. -// We always want to import the symbols of the gflags library +// Whether gflags library is a DLL. +// +// Set to 1 by default when the shared gflags library was built on Windows. +// Must be overwritten when this header file is used with the optionally also +// built static library instead; set by CMake's INTERFACE_COMPILE_DEFINITIONS. +#ifndef GFLAGS_IS_A_DLL +# define GFLAGS_IS_A_DLL @GFLAGS_IS_A_DLL@ +#endif + +// We always want to import the symbols of the gflags library. #ifndef GFLAGS_DLL_DECL -# if @GFLAGS_IS_A_DLL@ && defined(_MSC_VER) +# if GFLAGS_IS_A_DLL && defined(_MSC_VER) # define GFLAGS_DLL_DECL __declspec(dllimport) # else # define GFLAGS_DLL_DECL # endif #endif -// We always want to import variables declared in user code +// We always want to import variables declared in user code. #ifndef GFLAGS_DLL_DECLARE_FLAG -# if @GFLAGS_IS_A_DLL@ && defined(_MSC_VER) +# if GFLAGS_IS_A_DLL && defined(_MSC_VER) # define GFLAGS_DLL_DECLARE_FLAG __declspec(dllimport) # else # define GFLAGS_DLL_DECLARE_FLAG