mirror of
https://github.com/microsoft/vcpkg.git
synced 2025-01-01 13:37:55 +08:00
fdfe770571
* [vcpkg_*_nmake] Add option INSTALL_COMMAND * [gdal] Update to 3.1.3 and switch to vcpkg_*_nmake on Windows * [vcpkg_build_make] Add option MAKEFILE * fix install on windows, fix linux build * fix options position * [gdal] Fix linux build * [gdal] Fix expat library name * [gdal] Fix geos library name * [gdal] Fix cmake wrapper * [pdal] Fix dependency geos * [pdal] Fix PDALConfig.cmake * [gdal] Fix dependency cfitsio on *inx * disable cfitsio temporary * [gdal] Correct cmake wrapper and usage * [gdal] Fix tools on windows-static * Revert a9ac823007975485aacc7e1f3eb4053e295376e1 * Apply suggestions * [vcpkg_build_nmake] Fix install command * [vcpkg_build_nmake] Fix install command * regenerate docs * [gdal] Update dependency iconv and charset library names * [gdal] add json-c as a dependency on non-windows Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com> Co-authored-by: Nicole Mazzuca <mazzucan@outlook.com>
23 lines
688 B
Diff
23 lines
688 B
Diff
diff --git a/makefile.vc b/makefile.vc
|
|
index 8559f79..87f8fc9 100644
|
|
--- a/makefile.vc
|
|
+++ b/makefile.vc
|
|
@@ -61,7 +61,7 @@ TARGET_LIB = staticlib
|
|
|
|
DEFAULT_TARGETS =
|
|
|
|
-default: $(TARGET_LIB) $(PLUGIN_TARGET) apps_dir
|
|
+default: $(TARGET_LIB) $(PLUGIN_TARGET)
|
|
|
|
# Batch commands to clean main build output are stored in a macro so they can be reused by different
|
|
# targets in an inline temporary batch file.
|
|
@@ -230,8 +230,6 @@ install: default docs
|
|
if exist $(GDAL_DLL) $(INSTALL) $(GDAL_DLL) $(BINDIR)
|
|
cd frmts
|
|
$(MAKE) /f makefile.vc plugins-install
|
|
- cd ..\apps
|
|
- $(MAKE) /f makefile.vc install
|
|
cd ..
|
|
$(INSTALL) data\*.* "$(DATADIR)"
|
|
$(INSTALL) LICENSE.TXT "$(DATADIR)"
|