From e97fc20bfd99d341174dc61c30ce7f9540786a6f Mon Sep 17 00:00:00 2001 From: dota17 Date: Thu, 7 May 2020 14:50:43 +0800 Subject: [PATCH] update --- CMakeLists.txt | 7 +------ README.md | 12 +++--------- 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index dc84b52..dc36d18 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -69,6 +69,7 @@ include(GNUInstallDirs) include(CMakePackageConfigHelpers) 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. ADD_CUSTOM_TARGET(distcheck @@ -412,12 +413,6 @@ if (BUILD_STATIC_LIBS) set_target_properties(${ORIGINAL_STATIC_LIB_NAME} PROPERTIES OUTPUT_NAME ${PROJECT_NAME} ) - - target_include_directories(${PROJECT_NAME} - PUBLIC - $ - $ - ) endif () # Always create new install dirs with 0755 permissions, regardless of umask diff --git a/README.md b/README.md index 909fd11..f5a7ee3 100644 --- a/README.md +++ b/README.md @@ -97,8 +97,8 @@ Variable | Type | Description ---------------------|--------|-------------- CMAKE_INSTALL_PREFIX | String | The install location. 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_STATIC_LIBS | Bool | This build generates a static (lib/a) library. +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 | 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_THREADING | Bool | Enable partial threading support 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. ```sh -# build a static library +# build a static library only cmake -DBUILD_SHARED_LIBS=OFF .. ``` -Allow to build both static and shared libraries. - -```sh -cmake -DBUILD_STATIC_LIBS=ON .. -``` - ### Building with partial threading support Although json-c does not support fully multi-threaded access to -- 2.50.1