aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--README.md2
-rw-r--r--ports/cppzmq/CONTROL4
-rw-r--r--ports/cppzmq/portfile.cmake16
-rw-r--r--ports/double-conversion/portfile.cmake44
-rw-r--r--ports/glfw3/portfile.cmake22
-rw-r--r--ports/libjpeg-turbo/portfile.cmake14
-rw-r--r--ports/think-cell-range/CONTROL2
-rw-r--r--ports/think-cell-range/portfile.cmake8
8 files changed, 61 insertions, 51 deletions
diff --git a/README.md b/README.md
index 1a34c1c4a..ba9a989e4 100644
--- a/README.md
+++ b/README.md
@@ -31,7 +31,7 @@ Vcpkg is built with your contributions. Here are some ways you can contribute:
* [Submit Issues](https://github.com/Microsoft/vcpkg/issues) in vcpkg or existing packages
* [Submit Fixes and New Packages](https://github.com/Microsoft/vcpkg/pulls)
-Please refer to our [Contribution guidelines](docs/CONTRIBUTING.md) for more details.
+Please refer to our [Contribution guidelines](CONTRIBUTING.md) for more details.
This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments.
diff --git a/ports/cppzmq/CONTROL b/ports/cppzmq/CONTROL
new file mode 100644
index 000000000..a7625e25d
--- /dev/null
+++ b/ports/cppzmq/CONTROL
@@ -0,0 +1,4 @@
+Source: cppzmq
+Version: 0.0.0-1
+Build-Depends: zeromq
+Description: lightweight messaging kernel, C++ bindings
diff --git a/ports/cppzmq/portfile.cmake b/ports/cppzmq/portfile.cmake
new file mode 100644
index 000000000..c2e03c81d
--- /dev/null
+++ b/ports/cppzmq/portfile.cmake
@@ -0,0 +1,16 @@
+#header-only library
+include(vcpkg_common_functions)
+set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/cppzmq-7faa9b061843fcbceb7ed94984ee8f20284ee759)
+vcpkg_download_distfile(ARCHIVE
+ URLS "https://github.com/zeromq/cppzmq/archive/7faa9b061843fcbceb7ed94984ee8f20284ee759.zip"
+ FILENAME "cppzmq-7faa.zip"
+ SHA512 10ba10f0e9a2387dc75fec01c2629b969f23d6152596a475474b701a4efccc4007c8eae5ec2a89f7f26e7d117f36016aaead16bf3325a8780bfd6419d84ac54e
+)
+vcpkg_extract_source_archive(${ARCHIVE})
+
+# cppzmq is a single header library, so we just need to copy that file in the include directory
+file(INSTALL ${SOURCE_PATH}/zmq.hpp DESTINATION ${CURRENT_PACKAGES_DIR}/include)
+
+# Handle copyright
+file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/cppzmq)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/cppzmq/LICENSE ${CURRENT_PACKAGES_DIR}/share/cppzmq/copyright)
diff --git a/ports/double-conversion/portfile.cmake b/ports/double-conversion/portfile.cmake
index 6ac38fffd..670cb4310 100644
--- a/ports/double-conversion/portfile.cmake
+++ b/ports/double-conversion/portfile.cmake
@@ -6,6 +6,14 @@
# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET}
#
+# Common Ambient Variables:
+# VCPKG_ROOT_DIR = <C:\path\to\current\vcpkg>
+# TARGET_TRIPLET is the current triplet (x86-windows, etc)
+# PORT is the current port name (zlib, etc)
+# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT}
+# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET}
+#
+
include(${CMAKE_TRIPLET_FILE})
include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/double-conversion-d4d68e4e788bec89d55a6a3e33af674087837c82)
@@ -15,31 +23,17 @@ vcpkg_download_distfile(ARCHIVE
SHA512 1406dc22b4ea71e1a2490f96cfed3230e122b97607c83ba106df4e90c7e4bfdcfc136c88741e7f1127237b38b4944d462ec5a4627a71f5ea3fe14afbcc64cd44
)
vcpkg_extract_source_archive(${ARCHIVE})
-
-vcpkg_apply_patches(
- SOURCE_PATH ${SOURCE_PATH}
- PATCHES ${CMAKE_CURRENT_LIST_DIR}/mscv_vers.patch
-)
-
-vcpkg_build_msbuild(
- PROJECT_PATH ${SOURCE_PATH}/msvc/double-conversion.vcxproj
-)
-
-message(STATUS "Installing")
-file(INSTALL
- ${SOURCE_PATH}/msvc/Debug/Win32/double-conversion.lib
- DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib
-)
-file(INSTALL
- ${SOURCE_PATH}/msvc/Release/Win32/double-conversion.lib
- DESTINATION ${CURRENT_PACKAGES_DIR}/lib
-)
-
-file(COPY ${SOURCE_PATH}/double-conversion DESTINATION ${CURRENT_PACKAGES_DIR}/include)
-
-if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
- vcpkg_copy_pdbs()
-endif()
+vcpkg_configure_cmake(SOURCE_PATH ${SOURCE_PATH}
+ OPTIONS -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=True)
+vcpkg_install_cmake()
+file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share)
+file(RENAME ${CURRENT_PACKAGES_DIR}/CMake ${CURRENT_PACKAGES_DIR}/share/double-conversion)
+file(READ ${CURRENT_PACKAGES_DIR}/debug/CMake/double-conversionLibraryDepends-debug.cmake DEBUG_MODULE)
+string(REPLACE "\${_IMPORT_PREFIX}" "\${_IMPORT_PREFIX}/debug" DEBUG_MODULE "${DEBUG_MODULE}")
+file(WRITE ${CURRENT_PACKAGES_DIR}/share/double-conversion/double-conversionLibraryDepends-debug.cmake "${DEBUG_MODULE}")
+#file(COPY ${SOURCE_PATH}/double-conversion DESTINATION ${CURRENT_PACKAGES_DIR}/include)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/CMake)
+vcpkg_copy_pdbs()
message(STATUS "Installing done")
diff --git a/ports/glfw3/portfile.cmake b/ports/glfw3/portfile.cmake
index f2aa28e04..b947142d8 100644
--- a/ports/glfw3/portfile.cmake
+++ b/ports/glfw3/portfile.cmake
@@ -1,7 +1,4 @@
include(${CMAKE_TRIPLET_FILE})
-if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
- message(FATAL_ERROR "Static building not supported yet")
-endif()
include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/glfw-3.2.1)
vcpkg_download_distfile(ARCHIVE
@@ -27,25 +24,15 @@ endif()
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
OPTIONS
- -DBUILD_SHARED_LIBS=ON
-DGLFW_BUILD_EXAMPLES=OFF
-DGLFW_BUILD_TESTS=OFF
-DGLFW_BUILD_DOCS=OFF
-DPACKAGE_CMAKE_INSTALL_PREFIX=\${CMAKE_CURRENT_LIST_DIR}/../..
- # OPTIONS_RELEASE -DOPTIMIZE=1
- # OPTIONS_DEBUG -DDEBUGGABLE=1
)
vcpkg_install_cmake()
-file(MAKE_DIRECTORY
- ${CURRENT_PACKAGES_DIR}/bin
- ${CURRENT_PACKAGES_DIR}/debug/bin
- ${CURRENT_PACKAGES_DIR}/share
-)
-file(RENAME ${CURRENT_PACKAGES_DIR}/lib/glfw3.dll ${CURRENT_PACKAGES_DIR}/bin/glfw3.dll)
-file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/glfw3.dll ${CURRENT_PACKAGES_DIR}/debug/bin/glfw3.dll)
-
+file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share)
file(RENAME ${CURRENT_PACKAGES_DIR}/lib/cmake/glfw3 ${CURRENT_PACKAGES_DIR}/share/glfw3)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/cmake)
file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/cmake/glfw3/glfw3Targets-debug.cmake ${CURRENT_PACKAGES_DIR}/share/glfw3/glfw3Targets-debug.cmake)
@@ -53,8 +40,11 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/cmake)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/glfw3.lib)
-file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/glfw3.lib)
+if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
+ file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
+ file(RENAME ${CURRENT_PACKAGES_DIR}/lib/glfw3.dll ${CURRENT_PACKAGES_DIR}/bin/glfw3.dll)
+ file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/glfw3.dll ${CURRENT_PACKAGES_DIR}/debug/bin/glfw3.dll)
+endif()
file(COPY ${SOURCE_PATH}/COPYING.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/glfw3)
file(RENAME ${CURRENT_PACKAGES_DIR}/share/glfw3/COPYING.txt ${CURRENT_PACKAGES_DIR}/share/glfw3/copyright)
diff --git a/ports/libjpeg-turbo/portfile.cmake b/ports/libjpeg-turbo/portfile.cmake
index 44958628c..0ec4a0c9c 100644
--- a/ports/libjpeg-turbo/portfile.cmake
+++ b/ports/libjpeg-turbo/portfile.cmake
@@ -1,7 +1,4 @@
include(${CMAKE_TRIPLET_FILE})
-if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
- message(FATAL_ERROR "Static building not supported yet")
-endif()
include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/libjpeg-turbo-1.4.90)
@@ -20,10 +17,19 @@ vcpkg_find_acquire_program(NASM)
get_filename_component(NASM_EXE_PATH ${NASM} DIRECTORY)
set(ENV{PATH} "${NASM_EXE_PATH};$ENV{PATH}")
+if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
+ set(BUILD_STATIC OFF)
+ set(NOT_BUILD_STATIC ON)
+else()
+ set(BUILD_STATIC ON)
+ set(NOT_BUILD_STATIC OFF)
+endif()
+
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
OPTIONS
- -DENABLE_STATIC=OFF
+ -DENABLE_STATIC=${BUILD_STATIC}
+ -DENABLE_SHARED=${NOT_BUILD_STATIC}
-DWITH_CRT_DLL=ON
-DENABLE_EXECUTABLES=OFF
-DINSTALL_DOCS=OFF
diff --git a/ports/think-cell-range/CONTROL b/ports/think-cell-range/CONTROL
index 0311dd1ae..80b05f586 100644
--- a/ports/think-cell-range/CONTROL
+++ b/ports/think-cell-range/CONTROL
@@ -1,5 +1,5 @@
Source: think-cell-range
Maintainer: jfrederich@gmail.com
-Version: 61e184a
+Version: 1d785d9
Description: think-cell's range library <https://think-cell.com>, <https://github.com/think-cell/range>, <https://www.think-cell.com/en/career/talks/ranges/#1>
Build-Depends: boost
diff --git a/ports/think-cell-range/portfile.cmake b/ports/think-cell-range/portfile.cmake
index 81dc0eea4..bbe75cf8b 100644
--- a/ports/think-cell-range/portfile.cmake
+++ b/ports/think-cell-range/portfile.cmake
@@ -1,9 +1,9 @@
include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/range-61e184a102d7818fd18f293c9ef99e6ebb59c222)
+set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/range-1d785d99b6d4e43b951bff51219e9304b012c3fe)
vcpkg_download_distfile(ARCHIVE
- URLS "https://github.com/think-cell/range/archive/61e184a102d7818fd18f293c9ef99e6ebb59c222.zip"
- FILENAME "think-cell_range-61e184a.zip"
- SHA512 1d27039918954624f98638636d107b4f8a997bee264552437f6229da4bce7fda31e67ac6f7b3b92a6dfa8d466b4ca6c05c1e516f3e7b37e0853d7d4153ef9587
+ URLS "https://github.com/think-cell/range/archive/1d785d99b6d4e43b951bff51219e9304b012c3fe.zip"
+ FILENAME "think-cell_range-1d785d9.zip"
+ SHA512 2248d9bcc053f67c4b30b640254bf89a2f4c753fb144219806358175fb897a264c330e870556568d3b2f6c6987f49a5a875492b36f614f19bca0e3b46d0c2490
)
vcpkg_extract_source_archive(${ARCHIVE})
generated by cgit v1.2.3 (git 2.25.1) at 2026-09-24 01:39:43 +0000