Skip to content

Commit 399e965

Browse files
committed
shared/static name clash
1 parent 73298a8 commit 399e965

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

src/lib_json/CMakeLists.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,10 @@ 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+
if (NOT BUILD_SHARED_LIBS)
99+
SET_TARGET_PROPERTIES( jsoncpp_lib_static PROPERTIES OUTPUT_NAME jsoncpp
100+
DEBUG_OUTPUT_NAME jsoncpp${DEBUG_LIBNAME_SUFFIX} )
101+
endif ()
100102

101103
INSTALL( TARGETS jsoncpp_lib_static ${INSTALL_EXPORT}
102104
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}

0 commit comments

Comments
 (0)