mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-24 14:51:07 +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 a9ac823007
* 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>
39 lines
965 B
Diff
39 lines
965 B
Diff
diff --git a/makefile.vc b/makefile.vc
|
|
index 9e0bd44..8559f79 100644
|
|
--- a/makefile.vc
|
|
+++ b/makefile.vc
|
|
@@ -84,7 +84,7 @@ staticlib: $(LIB_DEPENDS)
|
|
call <<clean_main_build_output.bat
|
|
$(CLEAN_MAIN_BUILD_OUTPUT_CMDS)
|
|
<<
|
|
- lib /nologo /out:$(GDAL_LIB_NAME) $(LIBOBJ) $(EXTERNAL_LIBS)
|
|
+ lib /nologo /LTCG /out:$(GDAL_LIB_NAME) $(LIBOBJ) $(EXTERNAL_LIBS)
|
|
|
|
appslib-target:
|
|
cd apps
|
|
@@ -204,9 +204,6 @@ dll: $(GDAL_DLL)
|
|
|
|
# build using cygwin
|
|
docs:
|
|
-!IFDEF HTMLDIR
|
|
- make PYTHONHOME= -C doc html
|
|
-!ENDIF
|
|
|
|
bindings:
|
|
-for %d in ( $(BINDINGS) ) do \
|
|
@@ -236,12 +233,8 @@ install: default docs
|
|
cd ..\apps
|
|
$(MAKE) /f makefile.vc install
|
|
cd ..
|
|
- $(INSTALL) data\*.* $(DATADIR)
|
|
- $(INSTALL) LICENSE.TXT $(DATADIR)
|
|
-!IFDEF HTMLDIR
|
|
- -mkdir $(HTMLDIR)
|
|
- xcopy /S /Y doc\build\html $(HTMLDIR)
|
|
-!ENDIF
|
|
+ $(INSTALL) data\*.* "$(DATADIR)"
|
|
+ $(INSTALL) LICENSE.TXT "$(DATADIR)"
|
|
!IFDEF INCLUDE_OGR_FRMTS
|
|
cd ogr\ogrsf_frmts
|
|
$(MAKE) /f makefile.vc plugins-install
|