diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2016-12-07 15:23:50 -0800 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2016-12-07 15:23:50 -0800 |
| commit | 7555e6576bff0b588edb40d4b531a92546de2b2f (patch) | |
| tree | 15e0d4f29321551c5925a92178c63c0fd9513f64 | |
| parent | e6ebc0369990c1d670d87bec248ffb04739df334 (diff) | |
| download | vcpkg-7555e6576bff0b588edb40d4b531a92546de2b2f.tar.gz vcpkg-7555e6576bff0b588edb40d4b531a92546de2b2f.zip | |
[geos] Extract SOURCE_PATH variable
| -rw-r--r-- | ports/geos/portfile.cmake | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/ports/geos/portfile.cmake b/ports/geos/portfile.cmake index 60d907acd..7cd50db58 100644 --- a/ports/geos/portfile.cmake +++ b/ports/geos/portfile.cmake @@ -7,6 +7,7 @@ # include(vcpkg_common_functions) +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/3.5) #downloading 3.5 from their SVN repo and not the release tarball #because the 3.5 release did not build on windows, and fixes were backported #without generating a new release tarball (I don't think very many GIS people use win) @@ -17,12 +18,12 @@ vcpkg_download_distfile(ARCHIVE ) vcpkg_extract_source_archive(${ARCHIVE}) -#we need to do this because GOES deploy process is totally broken for cmake +#we need to do this because GEOS deploy process is totally broken for cmake #file(DOWNLOAD http://svn.osgeo.org/geos/tags/3.5.0/cmake/modules/GenerateSourceGroups.cmake -# ${CURRENT_BUILDTREES_DIR}/src/geos-3.5.0/cmake/modules/GenerateSourceGroups.cmake) -file(WRITE ${CURRENT_BUILDTREES_DIR}/src/3.5/geos_svn_revision.h "#define GEOS_SVN_REVISION 4261") +# ${SOURCE_PATH}/cmake/modules/GenerateSourceGroups.cmake) +file(WRITE ${SOURCE_PATH}/geos_svn_revision.h "#define GEOS_SVN_REVISION 4261") vcpkg_configure_cmake( - SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/3.5 + SOURCE_PATH ${SOURCE_PATH} OPTIONS -DGEOS_ENABLE_TESTS=False -DBUILD_TESTING=False ) @@ -31,7 +32,7 @@ vcpkg_build_cmake() vcpkg_install_cmake() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) # Handle copyright -file(COPY ${CURRENT_BUILDTREES_DIR}/src/3.5/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/geos) +file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/geos) file(RENAME ${CURRENT_PACKAGES_DIR}/share/geos/COPYING ${CURRENT_PACKAGES_DIR}/share/geos/copyright) if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/libgeos.lib ${CURRENT_PACKAGES_DIR}/debug/lib/libgeos.lib) |