point to the correct swig.exe

infinispan · Aug 3, 2018 · 11b02cc · 11b02cc
1 parent bbdd4bb
commit 11b02cc
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -167,7 +167,7 @@ if (WIN32)
 
   add_custom_target(
     swig ALL
-    COMMAND cmake -G "${CMAKE_GENERATOR}" "-DHOTRODCPP_HOME=${NATIVE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/swig"
+    COMMAND cmake -G "${CMAKE_GENERATOR}" "-DHOTRODCPP_HOME=${NATIVE_DIR}" "-DSWIG_DIR=${SWIG_DIR}" "-DSWIG_EXECUTABLE=${SWIG_EXECUTABLE}" "${CMAKE_CURRENT_SOURCE_DIR}/swig"
     COMMAND cmake --build . --config "${CMAKE_CFG_INTDIR}"
     WORKING_DIRECTORY "${SWIG_BUILD}"
     DEPENDS ${PROTO_SRCS} ${TEST_PROTO_SRCS}

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -19,15 +19,14 @@ pipeline {
                 PROTOBUF_LIBRARY = 'C:\\\\protobuf-2.6.1-pack\\\\lib\\\\libprotobuf-static.lib'
                 PROTOBUF_PROTOC_EXECUTABLE = 'C:\\\\protobuf-2.6.1-pack\\\\bin\\\\protoc.exe'
                 PROTOBUF_PROTOC_LIBRARY = 'C:\\\\protobuf-2.6.1-pack\\\\lib\\\\libprotoc.lib'
-                SWIG_DIR = 'C:\\\\PROGRA~1\\\\SWIGWI~1.12'
-                SWIG_EXECUTABLE = 'C:\\\\PROGRA~1\\\\SWIGWI~1.12\\\\SWIG.EXE'
+                SWIG_DIR = 'C:\\\\PROGRA~1\\\\SWIGWI~2.12'
+                SWIG_EXECUTABLE = 'C:\\\\PROGRA~1\\\\SWIGWI~2.12\\\\SWIG.EXE'
                 test32 = 'empty'
                 test64 = 'empty'
                 version_1major = '8'
                 version_2minor = '1'
                 version_3micro = '0'
                 version_4qualifier = 'Final'
-                HOTROD_LOG_LEVEL = 'TRACE'
             }
             steps {
                 dir('cpp-client') {
@@ -72,7 +71,7 @@ pipeline {
                 PROTOBUF_PROTOC_EXECUTABLE  = 'C:\\\\protobuf-2.6.1-pack\\\\bin\\\\protoc.exe'
                 PROTOBUF_PROTOC_EXECUTABLE_CS  = 'C:\\\\Users\\\\Administrator\\\\Google.Protobuf.Tools.3.4.0\\\\tools\\\\windows_x64\\\\protoc.exe'
                 PROTOBUF_PROTOC_LIBRARY  = 'C:\\\\protobuf-2.6.1-pack\\\\lib\\\\libprotoc.lib'
-                SWIG_DIR  = 'C:\\\\PROGRA~1\\\\SWIGWI~1.12'
+                SWIG_DIR  = 'C:\\\\PROGRA~1\\\\SWIGWI~2.12'
                 SWIG_EXECUTABLE  = 'C:\\\\PROGRA~1\\\\SWIGWI~2.12\\\\SWIG.EXE'
                 test32  = 'skip'
                 test64  = 'run'

diff --git a/build.bat b/build.bat
@@ -16,7 +16,7 @@ cd build_windows
 set "buildTest=%~1"
 
 call :unquote u_generator %generator%
-cmake -G "%u_generator%" -DHOTRODCPP_HOME=%HOTRODCPP_HOME% -DPROTOBUF_PROTOC_EXECUTABLE_CS="%PROTOBUF_PROTOC_EXECUTABLE_CS%" -DGOOGLE_PROTOBUF_NUPKG="%GOOGLE_PROTOBUF_NUPKG%" -DPROTOBUF_INCLUDE_DIR=%PROTOBUF_INCLUDE_DIR% -DJBOSS_HOME=%JBOSS_HOME% -DIKVM_CUSTOM_BIN_PATH=%IKVM_CUSTOM_BIN_PATH% -DOPENSSL_ROOT_DIR=%OPENSSL_ROOT_DIR% -DCONFIGURATION=RelWithDebInfo %~4 ..
+cmake -G "%u_generator%" -DHOTRODCPP_HOME=%HOTRODCPP_HOME% -DSWIG_DIR=%SWIG_DIR% -DSWIG_EXECUTABLE=%SWIG_EXECUTABLE% -DPROTOBUF_PROTOC_EXECUTABLE_CS="%PROTOBUF_PROTOC_EXECUTABLE_CS%" -DGOOGLE_PROTOBUF_NUPKG="%GOOGLE_PROTOBUF_NUPKG%" -DPROTOBUF_INCLUDE_DIR=%PROTOBUF_INCLUDE_DIR% -DJBOSS_HOME=%JBOSS_HOME% -DIKVM_CUSTOM_BIN_PATH=%IKVM_CUSTOM_BIN_PATH% -DOPENSSL_ROOT_DIR=%OPENSSL_ROOT_DIR% -DCONFIGURATION=RelWithDebInfo %~4 ..
 if %errorlevel% neq 0 goto fail
 
 cmake --build . --config RelWithDebInfo