Merge pull request #1321 from breznak/update_swig

update swig to 3.0.12

external/Swig.cmake

@@ -27,15 +27,22 @@
 #   SWIG_DIR: the directory where swig is installed (.i files, etc.) as defined
 #             by FindSWIG.
 
-set(swig_path "${REPOSITORY_DIR}/external/common/src/swig-3.0.2.tar.gz")
+set(swig_path "${REPOSITORY_DIR}/external/common/src/swig-3.0.12.tar.gz")
+set(swigwin_path "${REPOSITORY_DIR}/external/common/src/swigwin-3.0.12.zip")
 set(pcre_path "${REPOSITORY_DIR}/external/common/src/pcre-8.37.tar.gz")
 
 if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
-  # We bundle pre-built Swig for Windows (presumably because we can't build it?)
-  add_custom_target(Swig)
-  set(swig_executable
-      ${PROJECT_SOURCE_DIR}/${PLATFORM}${BITNESS}${PLATFORM_SUFFIX}/bin/swig.exe)
-  set(swig_dir ${PROJECT_SOURCE_DIR}/common/share/swig/3.0.2)
+  ExternalProject_Add(
+    Swig
+    URL ${swigwin_path}
+    SOURCE_DIR "${EP_BASE}/Install/swig"
+    UPDATE_COMMAND ""
+    CONFIGURE_COMMAND ""
+    BUILD_COMMAND ""
+    INSTALL_COMMAND ""
+  )
+  set(swig_executable ${EP_BASE}/Install/swig/swig.exe)
+  set(swig_dir ${EP_BASE}/Install/swig/Lib)  
 else()
   # Build Swig from source on non-Windows (e.g., Linux and OS X)
   ExternalProject_Add(
@@ -49,7 +56,7 @@ else()
       ${EP_BASE}/Source/Swig/configure --prefix=${EP_BASE}/Install --disable-ccache --enable-cpp11-testing
   )
   set(swig_executable ${EP_BASE}/Install/bin/swig)
-  set(swig_dir ${EP_BASE}/Install/share/swig/3.0.2)
+  set(swig_dir ${EP_BASE}/Install/share/swig/3.0.12)
 endif()
 
 set(SWIG_EXECUTABLE ${swig_executable} PARENT_SCOPE)