Merge branch 'master' into jsonpath

This commit is contained in:
Christopher Dunn 2021-11-03 11:25:01 -05:00 committed by GitHub
commit 960126ca89
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -119,7 +119,7 @@ if(BUILD_SHARED_LIBS)
OUTPUT_NAME jsoncpp OUTPUT_NAME jsoncpp
VERSION ${PROJECT_VERSION} VERSION ${PROJECT_VERSION}
SOVERSION ${PROJECT_SOVERSION} SOVERSION ${PROJECT_SOVERSION}
POSITION_INDEPENDENT_CODE ON POSITION_INDEPENDENT_CODE ${BUILD_SHARED_LIBS}
) )
# Set library's runtime search path on OSX # Set library's runtime search path on OSX
@ -180,7 +180,7 @@ if(BUILD_OBJECT_LIBS)
OUTPUT_NAME jsoncpp OUTPUT_NAME jsoncpp
VERSION ${PROJECT_VERSION} VERSION ${PROJECT_VERSION}
SOVERSION ${PROJECT_SOVERSION} SOVERSION ${PROJECT_SOVERSION}
POSITION_INDEPENDENT_CODE ON POSITION_INDEPENDENT_CODE ${BUILD_SHARED_LIBS}
) )
# Set library's runtime search path on OSX # Set library's runtime search path on OSX