Skip to content

Commit ce32274

Browse files
committed
Merge pull request open-source-parsers#295 from martyngigg/master
Allow an optional suffix on the debug library name in CMake
2 parents 6e52e27 + 717c791 commit ce32274

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ IF(NOT WIN32)
2121
ENDIF(NOT CMAKE_BUILD_TYPE)
2222
ENDIF(NOT WIN32)
2323

24+
SET(DEBUG_LIBNAME_SUFFIX "" CACHE STRING "Optional suffix to append to the library name for a debug build")
2425
SET(LIB_SUFFIX "" CACHE STRING "Optional arch-dependent suffix for the library installation directory")
2526

2627
SET(RUNTIME_INSTALL_DIR bin

src/lib_json/CMakeLists.txt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ if( CMAKE_COMPILER_IS_GNUCXX )
22
#Get compiler version.
33
execute_process( COMMAND ${CMAKE_CXX_COMPILER} -dumpversion
44
OUTPUT_VARIABLE GNUCXX_VERSION )
5-
5+
66
#-Werror=* was introduced -after- GCC 4.1.2
77
if( GNUCXX_VERSION VERSION_GREATER 4.1.2 )
88
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=strict-aliasing")
@@ -43,7 +43,8 @@ IF(BUILD_SHARED_LIBS)
4343
ADD_DEFINITIONS( -DJSON_DLL_BUILD )
4444
ADD_LIBRARY(jsoncpp_lib SHARED ${PUBLIC_HEADERS} ${jsoncpp_sources})
4545
SET_TARGET_PROPERTIES( jsoncpp_lib PROPERTIES VERSION ${JSONCPP_VERSION} SOVERSION ${JSONCPP_VERSION_MAJOR})
46-
SET_TARGET_PROPERTIES( jsoncpp_lib PROPERTIES OUTPUT_NAME jsoncpp )
46+
SET_TARGET_PROPERTIES( jsoncpp_lib PROPERTIES OUTPUT_NAME jsoncpp
47+
DEBUG_OUTPUT_NAME jsoncpp${DEBUG_LIBNAME_SUFFIX} )
4748

4849
INSTALL( TARGETS jsoncpp_lib ${INSTALL_EXPORT}
4950
RUNTIME DESTINATION ${RUNTIME_INSTALL_DIR}
@@ -61,7 +62,8 @@ ENDIF()
6162
IF(BUILD_STATIC_LIBS)
6263
ADD_LIBRARY(jsoncpp_lib_static STATIC ${PUBLIC_HEADERS} ${jsoncpp_sources})
6364
SET_TARGET_PROPERTIES( jsoncpp_lib_static PROPERTIES VERSION ${JSONCPP_VERSION} SOVERSION ${JSONCPP_VERSION_MAJOR})
64-
SET_TARGET_PROPERTIES( jsoncpp_lib_static PROPERTIES OUTPUT_NAME jsoncpp )
65+
SET_TARGET_PROPERTIES( jsoncpp_lib_static PROPERTIES OUTPUT_NAME jsoncpp
66+
DEBUG_OUTPUT_NAME jsoncpp${DEBUG_LIBNAME_SUFFIX} )
6567

6668
INSTALL( TARGETS jsoncpp_lib_static ${INSTALL_EXPORT}
6769
RUNTIME DESTINATION ${RUNTIME_INSTALL_DIR}

0 commit comments

Comments
 (0)