mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-13 05:49:02 +08:00
33 lines
1.0 KiB
Diff
33 lines
1.0 KiB
Diff
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||
|
|
index 58ae48c7..fc3b38a5 100644
|
||
|
|
--- a/CMakeLists.txt
|
||
|
|
+++ b/CMakeLists.txt
|
||
|
|
@@ -432,7 +432,6 @@ add_subdirectory(lib)
|
||
|
|
add_subdirectory(third-party)
|
||
|
|
add_subdirectory(src)
|
||
|
|
add_subdirectory(examples)
|
||
|
|
-add_subdirectory(tests)
|
||
|
|
#add_subdirectory(tests/testdata)
|
||
|
|
add_subdirectory(integration-tests)
|
||
|
|
if(ENABLE_DOC)
|
||
|
|
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
|
||
|
|
index 211c8e43..94e688d4 100644
|
||
|
|
--- a/lib/CMakeLists.txt
|
||
|
|
+++ b/lib/CMakeLists.txt
|
||
|
|
@@ -66,6 +66,7 @@ if(BUILD_SHARED_LIBS)
|
||
|
|
endif()
|
||
|
|
|
||
|
|
# Static library (for unittests because of symbol visibility)
|
||
|
|
+if(BUILD_STATIC_LIBS)
|
||
|
|
add_library(${STATIC_LIB} STATIC ${NGHTTP2_SOURCES})
|
||
|
|
|
||
|
|
set_target_properties(${STATIC_LIB} PROPERTIES
|
||
|
|
@@ -82,7 +83,6 @@ target_include_directories(${STATIC_LIB} INTERFACE
|
||
|
|
|
||
|
|
target_compile_definitions(${STATIC_LIB} PUBLIC "-DNGHTTP2_STATICLIB")
|
||
|
|
|
||
|
|
-if(BUILD_STATIC_LIBS)
|
||
|
|
install(TARGETS ${STATIC_LIB} EXPORT ${EXPORT_SET})
|
||
|
|
list(APPEND nghttp2_exports ${STATIC_LIB})
|
||
|
|
endif()
|