mirror of
https://github.com/open-source-parsers/jsoncpp.git
synced 2025-09-09 21:04:50 -04:00
Merge d57ddb67b2a80d96a84647aa55ced5d8d07f904d into ca98c98457b1163cca1f7d8db62827c115fec6d1
This commit is contained in:
commit
8616000f00
@ -79,6 +79,7 @@ option(JSONCPP_WITH_STRICT_ISO "Issue all the warnings demanded by strict ISO C
|
|||||||
option(JSONCPP_WITH_PKGCONFIG_SUPPORT "Generate and install .pc files" ON)
|
option(JSONCPP_WITH_PKGCONFIG_SUPPORT "Generate and install .pc files" ON)
|
||||||
option(JSONCPP_WITH_CMAKE_PACKAGE "Generate and install cmake package files" ON)
|
option(JSONCPP_WITH_CMAKE_PACKAGE "Generate and install cmake package files" ON)
|
||||||
option(JSONCPP_WITH_EXAMPLE "Compile JsonCpp example" OFF)
|
option(JSONCPP_WITH_EXAMPLE "Compile JsonCpp example" OFF)
|
||||||
|
option(JSONCPP_WITH_INSTALL "Include JsonCpp header and binaries in the install target" ON)
|
||||||
option(JSONCPP_STATIC_WINDOWS_RUNTIME "Use static (MT/MTd) Windows runtime" OFF)
|
option(JSONCPP_STATIC_WINDOWS_RUNTIME "Use static (MT/MTd) Windows runtime" OFF)
|
||||||
option(BUILD_SHARED_LIBS "Build jsoncpp_lib as a shared library." ON)
|
option(BUILD_SHARED_LIBS "Build jsoncpp_lib as a shared library." ON)
|
||||||
option(BUILD_STATIC_LIBS "Build jsoncpp_lib as a static library." ON)
|
option(BUILD_STATIC_LIBS "Build jsoncpp_lib as a static library." ON)
|
||||||
|
@ -1,5 +1,8 @@
|
|||||||
|
if (JSONCPP_WITH_INSTALL)
|
||||||
|
|
||||||
file(GLOB INCLUDE_FILES "json/*.h")
|
file(GLOB INCLUDE_FILES "json/*.h")
|
||||||
install(FILES
|
install(FILES
|
||||||
${INCLUDE_FILES}
|
${INCLUDE_FILES}
|
||||||
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/json)
|
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/json)
|
||||||
|
|
||||||
|
endif()
|
@ -196,6 +196,8 @@ if(BUILD_OBJECT_LIBS)
|
|||||||
list(APPEND CMAKE_TARGETS ${OBJECT_LIB})
|
list(APPEND CMAKE_TARGETS ${OBJECT_LIB})
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
if (JSONCPP_WITH_INSTALL)
|
||||||
|
|
||||||
install(TARGETS ${CMAKE_TARGETS} ${INSTALL_EXPORT}
|
install(TARGETS ${CMAKE_TARGETS} ${INSTALL_EXPORT}
|
||||||
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
|
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
|
||||||
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||||
@ -203,3 +205,4 @@ install(TARGETS ${CMAKE_TARGETS} ${INSTALL_EXPORT}
|
|||||||
OBJECTS DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
OBJECTS DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||||
)
|
)
|
||||||
|
|
||||||
|
endif()
|
||||||
|
Loading…
x
Reference in New Issue
Block a user