mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-11 21:29:00 +08:00
6af35363b8
* Make Bond always build as a static lib.
* Bond's CMake currently isn't written to be able to produce DLLs.
There's a special dllimport/dllexport dance that would need to be
done.
* Apply patch so that Bond doesn't force Boost static libs.
* Apply patch to omit installing Bond's copy of rapidjson.
* Clean up empty bin/ directories, now that vcpkg is more strict.
24 lines
747 B
Diff
24 lines
747 B
Diff
diff --git a/cmake/Config.cmake b/cmake/Config.cmake
|
|
index ed225d14..1573c915 100644
|
|
--- a/cmake/Config.cmake
|
|
+++ b/cmake/Config.cmake
|
|
@@ -19,7 +19,7 @@ if (MSVC)
|
|
# disable MSVC warnings
|
|
add_compile_options (/bigobj /FIbond/core/warning.h /W4 /WX)
|
|
add_definitions (-D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS)
|
|
- set (Boost_USE_STATIC_LIBS ON)
|
|
+ set (Boost_USE_STATIC_LIBS OFF)
|
|
endif (MSVC)
|
|
|
|
if (WIN32)
|
|
@@ -90,9 +90,6 @@ if (DEFINED ENV{APPVEYOR} AND ("$ENV{BOND_BUILD}" STREQUAL "C++"))
|
|
endif()
|
|
endif()
|
|
|
|
-# disable Boost auto-linking
|
|
-add_definitions (-DBOOST_ALL_NO_LIB)
|
|
-
|
|
# VS2015U2 fixed a bug with atomics and emits a warning without this definition.
|
|
add_definitions (-D_ENABLE_ATOMIC_ALIGNMENT_FIX)
|
|
|