mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-04 09:41:39 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
548ff8d3db
vcpkg/ports/bond/0001_boost_static_libs.patch

24 lines
824 B
Diff
Raw Normal View History

Upgrade Bond to 5.2.0 * 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.
2017-02-09 11:34:55 +08:00
diff --git a/cmake/Config.cmake b/cmake/Config.cmake
Upgrade Bond to 5.3.1 * Updated to the 5.3.1 release of Bond. * Removed now-redundant 0003_rename_gbc_during_install.patch. * Regenerated other patches.
2017-04-28 07:18:28 +08:00
index c6e2b40d..d8b4d689 100644
Upgrade Bond to 5.2.0 * 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.
2017-02-09 11:34:55 +08:00
--- a/cmake/Config.cmake
+++ b/cmake/Config.cmake
Upgrade Bond to 5.3.1 * Updated to the 5.3.1 release of Bond. * Removed now-redundant 0003_rename_gbc_during_install.patch. * Regenerated other patches.
2017-04-28 07:18:28 +08:00
@@ -35,7 +35,7 @@ if (MSVC)
# Bond with MSVC CRT-specific code too much. More details at
# https://msdn.microsoft.com/en-us/library/ms175759.aspx
add_definitions (-D_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1 -D_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1)
Upgrade Bond to 5.2.0 * 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.
2017-02-09 11:34:55 +08:00
- set (Boost_USE_STATIC_LIBS ON)
+ set (Boost_USE_STATIC_LIBS OFF)
endif (MSVC)
if (WIN32)
Upgrade Bond to 5.3.1 * Updated to the 5.3.1 release of Bond. * Removed now-redundant 0003_rename_gbc_during_install.patch. * Regenerated other patches.
2017-04-28 07:18:28 +08:00
@@ -106,9 +106,6 @@ if (DEFINED ENV{APPVEYOR} AND ("$ENV{BOND_BUILD}" STREQUAL "C++"))
Upgrade Bond to 5.2.0 * 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.
2017-02-09 11:34:55 +08:00
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)
Reference in New Issue Copy Permalink