mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-30 12:39:01 +08:00
c0d22c88ea
* [vcpkg_install_qmake] Add vcpkg_install_qmake and convert existing ports to use it. [vcpkg_configure_qmake] Add 'staticlib' to CONFIG in static builds * [vcpkg_configure_qmake] Don't specify DESTDIR * [libqglviewer][vcpkg_configure_qmake] Add staticlib CONFIG only for libqglviewer * [qt5-base] Increment version to track changes in vcpkg_configure_qmake()
22 lines
524 B
Diff
22 lines
524 B
Diff
diff --git a/QGLViewer/QGLViewer.pro b/QGLViewer/QGLViewer.pro
|
|
index 263a141..51e3359 100644
|
|
--- a/QGLViewer/QGLViewer.pro
|
|
+++ b/QGLViewer/QGLViewer.pro
|
|
@@ -38,7 +38,6 @@ SOURCES = \
|
|
|
|
HEADERS *= $${QGL_HEADERS}
|
|
DISTFILES *= qglviewer-icon.xpm
|
|
-DESTDIR = $${PWD}
|
|
|
|
TRANSLATIONS = qglviewer_fr.ts
|
|
|
|
@@ -273,7 +272,7 @@ win32 {
|
|
QMAKE_CXXFLAGS *= -TP -GR
|
|
DEFINES += NOMINMAX
|
|
win32-msvc {
|
|
- QMAKE_CXXFLAGS *= -EHs -FS
|
|
+ QMAKE_CXXFLAGS *= -EHs -FS
|
|
} else {
|
|
QMAKE_CXXFLAGS *= -EHs
|
|
}
|