aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoratkawa7 <atkawa7@yahoo.com>2017-05-25 18:08:19 -0700
committerGitHub <noreply@github.com>2017-05-25 18:08:19 -0700
commit9e65a5e24d05d181f7fdeabae85ed2ca12f2e9ab (patch)
tree72bea5f765de3b4737efed9a5bcb9d443ff9da60
parent9884310dbea5177f697ccee4d722af5fec9a2f63 (diff)
downloadvcpkg-9e65a5e24d05d181f7fdeabae85ed2ca12f2e9ab.tar.gz
vcpkg-9e65a5e24d05d181f7fdeabae85ed2ca12f2e9ab.zip
Remove unnecessary Variables
-Added vcpkg_find_acquire_program for flex and bison -Removed unnecessary variables
-rw-r--r--ports/thrift/portfile.cmake9
1 files changed, 3 insertions, 6 deletions
diff --git a/ports/thrift/portfile.cmake b/ports/thrift/portfile.cmake
index 8aec05cb7..b87d13aa7 100644
--- a/ports/thrift/portfile.cmake
+++ b/ports/thrift/portfile.cmake
@@ -9,7 +9,8 @@ endif()
# Currently, Thrift is designed to be packaged as a static library. As a static library, the consuming program / dll will only pull in the object files that it needs, so the per-binary size increase should be pretty small.
# Thrift isn't a very good candidate to become a dynamic library. No attempts are made to preserve binary compatibility, or to provide a C / COM-like interface to make binary compatibility easy.
-vcpkg_find_acquire_program(WINFLEXBISON)
+vcpkg_find_acquire_program(FLEX)
+vcpkg_find_acquire_program(BISON)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
@@ -19,13 +20,9 @@ vcpkg_from_github(
HEAD_REF master
)
-set(FLEX_EXECUTABLE "${DOWNLOADS}/tools/winflexbison/win_flex.exe")
-set(BISON_EXECUTABLE "${DOWNLOADS}/tools/winflexbison/win_bison.exe")
-
-
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
- OPTIONS -DWITH_SHARED_LIB=OFF -DWITH_STATIC_LIB=ON -DBUILD_TESTING=off -DBUILD_JAVA=off -DBUILD_C_GLIB=off -DBUILD_PYTHON=off -DBUILD_CPP=on -DBUILD_HASKELL=off -DBUILD_TUTORIALS=off -DFLEX_EXECUTABLE=${FLEX_EXECUTABLE} -DBISON_EXECUTABLE=${BISON_EXECUTABLE}
+ OPTIONS -DWITH_SHARED_LIB=OFF -DWITH_STATIC_LIB=ON -DBUILD_TESTING=off -DBUILD_JAVA=off -DBUILD_C_GLIB=off -DBUILD_PYTHON=off -DBUILD_CPP=on -DBUILD_HASKELL=off -DBUILD_TUTORIALS=off -DFLEX_EXECUTABLE=${FLEX} -DBISON_EXECUTABLE=${BISON}
)
vcpkg_install_cmake()