mirror/json-c
1
0
Fork 0
mirror of https://github.com/json-c/json-c.git synced 2026-04-05 21:39:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
dota17
2020-05-07 14:50:43 +08:00
parent 952db0f397
commit e97fc20bfd
2 changed files with 4 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@@ -69,6 +69,7 @@ include(GNUInstallDirs)
include(CMakePackageConfigHelpers) include(CMakePackageConfigHelpers)
option(BUILD_SHARED_LIBS "Default to building shared libraries" ON) option(BUILD_SHARED_LIBS "Default to building shared libraries" ON)
option(BUILD_STATIC_LIBS "Default to building static libraries" ON)
# Generate a release merge and test it to verify the correctness of republishing the package. # Generate a release merge and test it to verify the correctness of republishing the package.
ADD_CUSTOM_TARGET(distcheck ADD_CUSTOM_TARGET(distcheck
@@ -412,12 +413,6 @@ if (BUILD_STATIC_LIBS)
set_target_properties(${ORIGINAL_STATIC_LIB_NAME} PROPERTIES set_target_properties(${ORIGINAL_STATIC_LIB_NAME} PROPERTIES
OUTPUT_NAME ${PROJECT_NAME} OUTPUT_NAME ${PROJECT_NAME}
) )
target_include_directories(${PROJECT_NAME}
PUBLIC
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}>
$<BUILD_INTERFACE:${PROJECT_BINARY_DIR}>
)
endif () endif ()
# Always create new install dirs with 0755 permissions, regardless of umask # Always create new install dirs with 0755 permissions, regardless of umask

12
README.md
View File

@@ -97,8 +97,8 @@ Variable | Type | Description
---------------------|--------|-------------- ---------------------|--------|--------------
CMAKE_INSTALL_PREFIX | String | The install location. CMAKE_INSTALL_PREFIX | String | The install location.
CMAKE_BUILD_TYPE | String | Defaults to "debug" CMAKE_BUILD_TYPE | String | Defaults to "debug"
BUILD_SHARED_LIBS | Bool | The default build generates a dynamic (dll/so) library. Set this to OFF to create a static library instead. BUILD_SHARED_LIBS | Bool | The default build generates a dynamic (dll/so) library. Set this to OFF to create a static library only.
BUILD_STATIC_LIBS | Bool | This build generates a static (lib/a) library. BUILD_STATIC_LIBS | Bool | The default build generates a static (lib/a) library. Set this to OFF to create a shared library only.
ENABLE_RDRAND | Bool | Enable RDRAND Hardware RNG Hash Seed ENABLE_RDRAND | Bool | Enable RDRAND Hardware RNG Hash Seed
ENABLE_THREADING | Bool | Enable partial threading support ENABLE_THREADING | Bool | Enable partial threading support
DISABLE_WERROR | Bool | Disable use of -Werror DISABLE_WERROR | Bool | Disable use of -Werror
@@ -107,16 +107,10 @@ DISABLE_BSYMBOLIC | Bool | Disable use of -Bsymbolic-functions
Pass these options as `-D` on CMake's command-line. Pass these options as `-D` on CMake's command-line.
```sh ```sh
# build a static library # build a static library only
cmake -DBUILD_SHARED_LIBS=OFF .. cmake -DBUILD_SHARED_LIBS=OFF ..
``` ```
Allow to build both static and shared libraries.
```sh
cmake -DBUILD_STATIC_LIBS=ON ..
```
### Building with partial threading support ### Building with partial threading support
Although json-c does not support fully multi-threaded access to Although json-c does not support fully multi-threaded access to