Windows build tweaks. (#58)

Send VISIT_WINDOWS_DIR to source-pkg creator script. Remove commented out cmake code. fix compiler warning.
visit-dav · Feb 7, 2019 · 7ac21ed · 7ac21ed
1 parent 1b0056b
commit 7ac21ed
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -2245,6 +2245,7 @@ ELSE (NOT WIN32)
             COMMAND ${MAKENSIS}
                     /DVisItVersion=${VISIT_VERSION}
                     /DVISIT_SOURCE_DIR=${VSD_NATIVE}
+                    /DVISIT_WINDOWS_DIR=${VWD_NATIVE}
                     /DINSTALLER_LOCATION=${VISIT_BINARY_DIR}
                      ${VISIT_WINDOWS_DIR}/distribution/installation/sourceinstallation.nsi
             DEPENDS ${VISIT_WINDOWS_DIR}/distribution/installation/sourceinstallation.nsi

diff --git a/src/viewer/main/CMakeLists.txt b/src/viewer/main/CMakeLists.txt
@@ -116,7 +116,6 @@ ui/VisItPasswordWindow.h
 SET(VIEWERLIB_SOURCES
 ${VIEWER_UI}
 ${VIEWER_DDT}
-#QWsSocket.C
 SharedDaemon.C
 ViewerBaseUI.C
 ViewerClientConnection.C
@@ -146,7 +145,6 @@ ENDIF(VISIT_STATIC)
 SET(VIEWERLIB_MOC_SOURCES
 ${VIEWER_UI_MOC}
 ${VIEWER_DDT_MOC}
-#QWsSocket.h
 SharedDaemon.h
 ViewerBaseUI.h
 ViewerClientConnection.h

diff --git a/src/visitpy/common/visitmodule.C b/src/visitpy/common/visitmodule.C
@@ -244,9 +244,9 @@
 //
 extern "C"
 {
-    VISITMODULE_API void initvisit();
-    VISITMODULE_API void cli_initvisit(int, bool, int, char **, int, char **);
-    VISITMODULE_API void cli_runscript(const char *);
+    void VISITMODULE_API initvisit();
+    void VISITMODULE_API cli_initvisit(int, bool, int, char **, int, char **);
+    void VISITMODULE_API cli_runscript(const char *);
 
     // Expose these functions so we can call them from a facade
     // VisIt module from "import visit" inside of Python.
@@ -474,12 +474,11 @@ static std::map<std::string, AnnotationObjectRef> localObjectMap;
 
 static bool                  suppressQueryOutputState = false;
 
-typedef enum QueryOutputReturnType {
+static enum QueryOutputReturnType {
     QueryString = 0,
     QueryValue,
     QueryObject
-};
-static QueryOutputReturnType queryOutputReturnType = QueryString;
+} queryOutputReturnType = QueryString;
 
 // pickle related
 bool      pickleReady=false;