Fix swig cmake warnings

csound · Oct 28, 2019 · 53a9aed · 53a9aed
1 parent 391c7c0
commit 53a9aed
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 23 deletions.
diff --git a/interfaces/CMakeLists.txt b/interfaces/CMakeLists.txt
@@ -109,14 +109,14 @@ if(BUILD_PYTHON_INTERFACE OR BUILD_JAVA_INTERFACE OR BUILD_LUA_INTERFACE)
              ../include/csound.h ../include/cfgvar.h ../include/csound.hpp
              cs_glue.hpp csPerfThread.hpp CsoundFile.hpp
              CppSound.hpp filebuilding.h Soundfile.hpp)
-        if(SWIG_ADD_LIBRARY)
-	    SWIG_ADD_LIBRARY(csnd6 
-		 TYPE MODULE 
-		 LANGUAGE python 
-		 SOURCES python_interface.i)
- 	else()
-	    SWIG_ADD_MODULE(csnd6 python python_interface.i)
-	endif()
+        if(COMMAND SWIG_ADD_LIBRARY)
+	        SWIG_ADD_LIBRARY(csnd6 
+		     TYPE MODULE 
+		     LANGUAGE python 
+		     SOURCES python_interface.i)
+ 	    else()
+	        SWIG_ADD_MODULE(csnd6 python python_interface.i)
+	    endif()
         swig_link_libraries(csnd6 ${swigpython_LIBS})
         target_include_directories(${SWIG_MODULE_csnd6_REAL_NAME} PRIVATE ${PYTHON_INCLUDE_PATH})
         set_target_properties(${SWIG_MODULE_csnd6_REAL_NAME} PROPERTIES
@@ -179,14 +179,14 @@ endif()
                                         cs_glue.hpp csPerfThread.hpp CsoundFile.hpp
                                         CppSound.hpp filebuilding.h Soundfile.hpp)
 
-        if(SWIG_ADD_LIBRARY)
+        if(COMMAND SWIG_ADD_LIBRARY)
             SWIG_ADD_LIBRARY(_jcsound6 
-                         TYPE MODULE 
-                         LANGUAGE java 
-                         SOURCES java_interface.i)
- 	else()
-	    SWIG_ADD_MODULE(_jcsound6 java java_interface.i)
-	endif()
+                TYPE MODULE 
+                LANGUAGE java 
+                SOURCES java_interface.i)
+ 	    else()
+	        SWIG_ADD_MODULE(_jcsound6 java java_interface.i)
+	    endif()
         SWIG_LINK_LIBRARIES(_jcsound6 ${swigjava_LIBS})
         target_include_directories(${SWIG_MODULE__jcsound6_REAL_NAME}
         PRIVATE ${JNI_INCLUDE_DIRS})
@@ -230,14 +230,14 @@ endif()
                                         cs_glue.hpp csPerfThread.hpp CsoundFile.hpp
                                         CppSound.hpp filebuilding.h Soundfile.hpp)
 
-        if(SWIG_ADD_LIBRARY)
+        if(COMMAND SWIG_ADD_LIBRARY)
             SWIG_ADD_LIBRARY(luaCsnd6 
-                         TYPE MODULE 
-                         LANGUAGE lua 
-                         SOURCES lua_interface.i)
- 	else()
-	    SWIG_ADD_MODULE(luaCsnd6 lua lua_interface.i)
-	endif()
+                TYPE MODULE 
+                LANGUAGE lua 
+                SOURCES lua_interface.i)
+ 	    else()
+	        SWIG_ADD_MODULE(luaCsnd6 lua lua_interface.i)
+	    endif()
         SWIG_LINK_LIBRARIES(luaCsnd6 ${swiglua_LIBS})
 
         target_include_directories(${SWIG_MODULE_luaCsnd6_REAL_NAME} PRIVATE ${LUA_H_PATH})

diff --git a/msvc/downloadDependencies.ps1 b/msvc/downloadDependencies.ps1
@@ -84,7 +84,8 @@ New-Item -type file $vcpkgDir\downloads\AlwaysAllowDownloads -errorAction Silent
 # Download all vcpkg packages available
 echo "Downloading VC packages..."
 $targetTriplet = "x64-windows-static"
-vcpkg --triplet $targetTriplet install eigen3 fltk zlib libflac libogg libvorbis libsndfile libsamplerate portmidi portaudio liblo hdf5 dirent
+# TODO must download asiosdk and extract before doing portaudio installation
+#vcpkg --triplet $targetTriplet install eigen3 fltk zlib libflac libogg libvorbis libsndfile libsamplerate portmidi portaudio liblo hdf5 dirent
 
 $vcpkgTiming = (Get-Date).TimeOfDay