Commit dd48d704 authored by Andreas Schuh's avatar Andreas Schuh

Merge pull request #126 from hevy-CC4477/master

Use ```_static``` suffix in filename of static library on Windows to distinguish it from the import library.
parents 9ef0d522 d78b00d2
...@@ -298,13 +298,21 @@ set (TARGETS) ...@@ -298,13 +298,21 @@ set (TARGETS)
# static vs. shared # static vs. shared
foreach (TYPE IN ITEMS STATIC SHARED) foreach (TYPE IN ITEMS STATIC SHARED)
if (BUILD_${TYPE}_LIBS) if (BUILD_${TYPE}_LIBS)
string (TOLOWER "${TYPE}" type)
# whether or not targets are a DLL # whether or not targets are a DLL
if (OS_WINDOWS AND "^${TYPE}$" STREQUAL "^SHARED$") if (OS_WINDOWS AND "^${TYPE}$" STREQUAL "^SHARED$")
set (GFLAGS_IS_A_DLL 1) set (GFLAGS_IS_A_DLL 1)
set(GFLAG_STATIC_EXTENSION "")
else () else ()
if (OS_WINDOWS)
set(GFLAG_STATIC_EXTENSION _${type})
endif ()
set (GFLAGS_IS_A_DLL 0) set (GFLAGS_IS_A_DLL 0)
endif () endif ()
string (TOLOWER "${TYPE}" type)
# multi-threaded vs. single-threaded # multi-threaded vs. single-threaded
foreach (opts IN ITEMS "" _nothreads) foreach (opts IN ITEMS "" _nothreads)
if (BUILD_gflags${opts}_LIB) if (BUILD_gflags${opts}_LIB)
...@@ -325,9 +333,10 @@ foreach (TYPE IN ITEMS STATIC SHARED) ...@@ -325,9 +333,10 @@ foreach (TYPE IN ITEMS STATIC SHARED)
target_link_libraries (gflags${opts}-${type} ${CMAKE_THREAD_LIBS_INIT}) target_link_libraries (gflags${opts}-${type} ${CMAKE_THREAD_LIBS_INIT})
endif () endif ()
endif () endif ()
set_target_properties ( set_target_properties (
gflags${opts}-${type} PROPERTIES COMPILE_DEFINITIONS "${defines}" gflags${opts}-${type} PROPERTIES COMPILE_DEFINITIONS "${defines}"
OUTPUT_NAME "gflags${opts}" OUTPUT_NAME "gflags${opts}${GFLAG_STATIC_EXTENSION}"
VERSION "${PACKAGE_VERSION}" VERSION "${PACKAGE_VERSION}"
SOVERSION "${PACKAGE_SOVERSION}" SOVERSION "${PACKAGE_SOVERSION}"
) )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment