From: vsr <vsr@opencascade.com>
Date: Tue, 14 Feb 2017 10:02:19 +0000 (+0300)
Subject: 0023412: EDF 14194 - Conflict with native SWIG
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2Fvsr%2F23412;p=tools%2Flibbatch.git

0023412: EDF 14194 - Conflict with native SWIG

Workaround about stupid CMake bug that find_program performs search by iterating through names at first place instead of paths!!!
---

diff --git a/CMakeModules/FindLibbatchSWIG.cmake b/CMakeModules/FindLibbatchSWIG.cmake
index 99529fc..5fbe8db 100644
--- a/CMakeModules/FindLibbatchSWIG.cmake
+++ b/CMakeModules/FindLibbatchSWIG.cmake
@@ -23,5 +23,10 @@
 #
 #  !! Please read the generic detection procedure in libbatchMacros.cmake !!
 #
+
+# Workaround about stupid CMake bug that find_program performs search by iterating through names at first place
+# instead of paths!!!
+FIND_PROGRAM(SWIG_EXECUTABLE NAMES swig3.0 swig2.0 swig HINTS $ENV{SWIG_ROOT_DIR} PATH_SUFFIXES bin NO_CMAKE_SYSTEM_PATH NO_SYSTEM_ENVIRONMENT_PATH)
+
 SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(SWIG SWIG_EXECUTABLE 2)
 MARK_AS_ADVANCED(SWIG_EXECUTABLE SWIG_VERSION)