mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-30 12:39:01 +08:00
40 lines
1.8 KiB
Diff
40 lines
1.8 KiB
Diff
|
From 6e142f270524d78689a119737660050561cf853e Mon Sep 17 00:00:00 2001
|
||
|
|
From: Thomas Arcila <thomas.arcila@gmail.com>
|
||
|
|
Date: Sat, 9 Mar 2019 19:00:24 -0500
|
||
|
|
Subject: [PATCH] fix capnpc extension handling on Windows
|
||
|
|
|
||
|
|
---
|
||
|
|
c++/src/capnp/CMakeLists.txt | 2 +-
|
||
|
|
c++/src/capnp/compiler/capnp.c++ | 2 +-
|
||
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/c++/src/capnp/CMakeLists.txt b/c++/src/capnp/CMakeLists.txt
|
||
|
|
index 11cbf5af..20b99ed3 100644
|
||
|
|
--- a/c++/src/capnp/CMakeLists.txt
|
||
|
|
+++ b/c++/src/capnp/CMakeLists.txt
|
||
|
|
@@ -182,7 +182,7 @@ if(NOT CAPNP_LITE)
|
||
|
|
install(TARGETS capnp_tool capnpc_cpp capnpc_capnp ${INSTALL_TARGETS_DEFAULT_ARGS})
|
||
|
|
|
||
|
|
# Symlink capnpc -> capnp
|
||
|
|
- install(CODE "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E create_symlink capnp \"\$ENV{DESTDIR}${CMAKE_INSTALL_FULL_BINDIR}/capnpc\")")
|
||
|
|
+ install(CODE "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E create_symlink capnp${CMAKE_EXECUTABLE_SUFFIX} \"\$ENV{DESTDIR}${CMAKE_INSTALL_FULL_BINDIR}/capnpc${CMAKE_EXECUTABLE_SUFFIX}\")")
|
||
|
|
endif() # NOT CAPNP_LITE
|
||
|
|
|
||
|
|
# Tests ========================================================================
|
||
|
|
diff --git a/c++/src/capnp/compiler/capnp.c++ b/c++/src/capnp/compiler/capnp.c++
|
||
|
|
index 8e8c459b..d252fb12 100644
|
||
|
|
--- a/c++/src/capnp/compiler/capnp.c++
|
||
|
|
+++ b/c++/src/capnp/compiler/capnp.c++
|
||
|
|
@@ -78,7 +78,7 @@ public:
|
||
|
|
: context(context), disk(kj::newDiskFilesystem()), loader(*this) {}
|
||
|
|
|
||
|
|
kj::MainFunc getMain() {
|
||
|
|
- if (context.getProgramName().endsWith("capnpc")) {
|
||
|
|
+ if (context.getProgramName().endsWith("capnpc") || context.getProgramName().endsWith("capnpc.exe")) {
|
||
|
|
kj::MainBuilder builder(context, VERSION_STRING,
|
||
|
|
"Compiles Cap'n Proto schema files and generates corresponding source code in one or "
|
||
|
|
"more languages.");
|
||
|
|
--
|
||
|
|
2.19.1
|
||
|
|
|