@@ -2,7 +2,7 @@ if( CMAKE_COMPILER_IS_GNUCXX )
2
2
#Get compiler version.
3
3
execute_process ( COMMAND ${CMAKE_CXX_COMPILER} -dumpversion
4
4
OUTPUT_VARIABLE GNUCXX_VERSION )
5
-
5
+
6
6
#-Werror=* was introduced -after- GCC 4.1.2
7
7
if ( GNUCXX_VERSION VERSION_GREATER 4.1.2 )
8
8
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=strict-aliasing" )
@@ -43,7 +43,8 @@ IF(BUILD_SHARED_LIBS)
43
43
ADD_DEFINITIONS ( -DJSON_DLL_BUILD )
44
44
ADD_LIBRARY (jsoncpp_lib SHARED ${PUBLIC_HEADERS} ${jsoncpp_sources} )
45
45
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} )
47
48
48
49
INSTALL ( TARGETS jsoncpp_lib ${INSTALL_EXPORT}
49
50
RUNTIME DESTINATION ${RUNTIME_INSTALL_DIR}
@@ -61,7 +62,8 @@ ENDIF()
61
62
IF (BUILD_STATIC_LIBS)
62
63
ADD_LIBRARY (jsoncpp_lib_static STATIC ${PUBLIC_HEADERS} ${jsoncpp_sources} )
63
64
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} )
65
67
66
68
INSTALL ( TARGETS jsoncpp_lib_static ${INSTALL_EXPORT}
67
69
RUNTIME DESTINATION ${RUNTIME_INSTALL_DIR}
0 commit comments