aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPer-Arne Andersen <perara12@gmail.com>2017-03-10 00:50:21 +0100
committerGitHub <noreply@github.com>2017-03-10 00:50:21 +0100
commit241a1021adc98169d1b900da2db6c92ca2df242e (patch)
tree62b095d3d8f731467458f68bef847da4269d1bd1
parentda09a8136d32890ab5f3804d9abcc5f9685a30e0 (diff)
downloadvcpkg-241a1021adc98169d1b900da2db6c92ca2df242e.tar.gz
vcpkg-241a1021adc98169d1b900da2db6c92ca2df242e.zip
Removed flatbuffers tools directory
I propose a change in how flatbuffers flatc.exe are placed in the tools directory after installation. Currently flatc.exe is placed in a sub directory "flatbuffers" which scopes it out from PATH Tested ok on my end, however i'm not 100% sure that i did this formally correct.
-rw-r--r--ports/flatbuffers/portfile.cmake5
1 files changed, 1 insertions, 4 deletions
diff --git a/ports/flatbuffers/portfile.cmake b/ports/flatbuffers/portfile.cmake
index 5d52fc2a8..03e0e9c28 100644
--- a/ports/flatbuffers/portfile.cmake
+++ b/ports/flatbuffers/portfile.cmake
@@ -43,8 +43,7 @@ if(EXISTS ${CURRENT_PACKAGES_DIR}/debug/bin)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin)
endif()
if(EXISTS ${CURRENT_PACKAGES_DIR}/bin/flatc.exe)
- make_directory(${CURRENT_PACKAGES_DIR}/tools/flatbuffers)
- file(RENAME ${CURRENT_PACKAGES_DIR}/bin/flatc.exe ${CURRENT_PACKAGES_DIR}/tools/flatbuffers/flatc.exe)
+ file(RENAME ${CURRENT_PACKAGES_DIR}/bin/flatc.exe ${CURRENT_PACKAGES_DIR}/tools/flatc.exe)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin)
endif()
if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/flatbuffers.dll)
@@ -56,8 +55,6 @@ if(EXISTS ${CURRENT_PACKAGES_DIR}/debug/lib/flatbuffers.dll)
file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/flatbuffers.dll ${CURRENT_PACKAGES_DIR}/debug/bin/flatbuffers.dll)
endif()
-vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/flatbuffers)
-
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
# Handle copyright