Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[vlpp] Fix configure issues, export unofficial target #26887

Merged
merged 28 commits into from
Oct 17, 2022
Merged

[vlpp] Fix configure issues, export unofficial target #26887

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
dbbf254
[vlpp] Fix configure issues, export unofficial target
Sep 20, 2022
ad00f26
version
Sep 20, 2022
ca5b872
Update to latest, add features, force static only
Sep 22, 2022
cda4849
patch format
Sep 22, 2022
6ddc132
FIx feature option pos
Sep 22, 2022
5554cf2
typo
Sep 22, 2022
40ccde4
Remove source_group since it's no longer an interface library, fix re…
Sep 22, 2022
12f16ca
Drop support with uwp since port uses desktop app only api
Sep 22, 2022
c7ba8be
Drop support with osx, add system-related definitions
Sep 22, 2022
28bfe81
Revert c7ba8be6d8e9dc13931215f6b36923128916f39f
Sep 22, 2022
7f27460
correct relationship, add and modify features
Sep 23, 2022
44eddf2
Remove double quotes, fix extra_includes
Sep 23, 2022
12dbd74
fix installation
Sep 23, 2022
dbe60d7
Fix arm build, switch tool build to cmake
Sep 27, 2022
f39b871
Use official fix to fix arm issue
Sep 27, 2022
d542c3b
update to latest to fix arm regression
Sep 28, 2022
18371fc
Update to latest
Sep 30, 2022
55bd331
Set to interface library
Oct 8, 2022
9ec50a0
version
Oct 8, 2022
afcbb33
Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/…
Oct 8, 2022
326d3db
Update to latest
Oct 10, 2022
7e50308
version
Oct 10, 2022
51a1cf0
Apply suggestions
Oct 13, 2022
edbd6b2
version
Oct 13, 2022
89809d8
Update ref
Oct 17, 2022
9f0bc17
version
Oct 17, 2022
670c7ab
official target
Oct 17, 2022
1597419
version
Oct 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 14 additions & 6 deletions ports/vlpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ cmake_minimum_required(VERSION 3.3.0)

project(Vlpp VERSION 0.10.0.0 LANGUAGES CXX)

option(SKIP_HEADERS "Skip header installation" OFF)

# Sources
set(SRCS
Import/Vlpp.cpp
Expand All @@ -18,23 +20,29 @@ if(NOT CMAKE_CXX_STANDARD)
endif()

# Create and configure the target
add_library(Vlpp ${SRCS})
add_library(Vlpp INTERFACE ${SRCS})
JackBoosY marked this conversation as resolved.
Show resolved Hide resolved

# target_compile_definitions
target_compile_definitions(Vlpp PRIVATE UNICODE)
target_compile_definitions(Vlpp PRIVATE _UNICODE)
target_compile_definitions(Vlpp INTERFACE UNICODE)
target_compile_definitions(Vlpp INTERFACE _UNICODE)

target_include_directories(Vlpp PRIVATE ${PROJECT_SOURCE_DIR}/Import)
target_include_directories(Vlpp INTERFACE $<INSTALL_INTERFACE:Import>)

# Install
install(
TARGETS Vlpp
EXPORT unofficial-vlpp
RUNTIME DESTINATION "bin"
LIBRARY DESTINATION "lib"
ARCHIVE DESTINATION "lib"
)
)

install(EXPORT unofficial-vlpp
NAMESPACE unofficial::vlpp::
DESTINATION share/unofficial-vlpp
)

if (NOT DEFINED SKIP_HEADERS)
if (NOT SKIP_HEADERS)
install(
FILES
Import/Vlpp.h
Expand Down
10 changes: 6 additions & 4 deletions ports/vlpp/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)

vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO vczh-libraries/Release
Expand All @@ -13,15 +11,19 @@ file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}

vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS_DEBUG
-DSKIP_HEADERS=ON
)

vcpkg_cmake_install()
vcpkg_copy_pdbs()

file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-vlpp)

file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
JackBoosY marked this conversation as resolved.
Show resolved Hide resolved

# Tools
file(INSTALL "${SOURCE_PATH}/Tools/CppMerge.exe" DESTINATION "${CURRENT_PACKAGES_DIR}/tools")

# Handle copyright
file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/vlpp" RENAME copyright)
file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
JackBoosY marked this conversation as resolved.
Show resolved Hide resolved
6 changes: 5 additions & 1 deletion ports/vlpp/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,18 @@
{
"name": "vlpp",
"version": "0.11.0.0",
"port-version": 3,
"port-version": 4,
"description": "Common C++ construction, including string operation / generic container / linq / General-LR parser generator / multithreading / reflection for C++ / etc",
"homepage": "https://github.com/vczh-libraries/Release",
"license": null,
"dependencies": [
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}
]
}
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7666,7 +7666,7 @@
},
"vlpp": {
"baseline": "0.11.0.0",
"port-version": 3
"port-version": 4
},
"volk": {
"baseline": "1.3.204",
Expand Down
5 changes: 5 additions & 0 deletions versions/v-/vlpp.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "d593e711f4b1ee56e84b9cfe4fab3bcc79fc602e",
"version": "0.11.0.0",
"port-version": 4
},
{
"git-tree": "b4f56db04c13b5bf335e4e5939617596e15e89ac",
"version": "0.11.0.0",
Expand Down