Skip to content

Commit 24114ff

Browse files
committed
Avoid import/static libs name clash
1 parent f45c01a commit 24114ff

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

src/lib_json/CMakeLists.txt

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,14 @@ ENDIF()
9595
IF(BUILD_STATIC_LIBS)
9696
ADD_LIBRARY(jsoncpp_lib_static STATIC ${PUBLIC_HEADERS} ${jsoncpp_sources})
9797
SET_TARGET_PROPERTIES( jsoncpp_lib_static PROPERTIES VERSION ${JSONCPP_VERSION} SOVERSION ${JSONCPP_SOVERSION})
98-
SET_TARGET_PROPERTIES( jsoncpp_lib_static PROPERTIES OUTPUT_NAME jsoncpp
99-
DEBUG_OUTPUT_NAME jsoncpp${DEBUG_LIBNAME_SUFFIX} )
98+
# avoid name clashes on windows as the shared import lib is also named jsoncpp.lib
99+
if (BUILD_SHARED_LIBS)
100+
set_target_properties (jsoncpp_lib_static PROPERTIES OUTPUT_NAME jsoncpp_static
101+
DEBUG_OUTPUT_NAME jsoncpp_static${DEBUG_LIBNAME_SUFFIX})
102+
else ()
103+
set_target_properties (jsoncpp_lib_static PROPERTIES OUTPUT_NAME jsoncpp
104+
DEBUG_OUTPUT_NAME jsoncpp${DEBUG_LIBNAME_SUFFIX})
105+
endif ()
100106

101107
INSTALL( TARGETS jsoncpp_lib_static ${INSTALL_EXPORT}
102108
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}

0 commit comments

Comments
 (0)