X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=cmake%2FFindSalomeSWIG.cmake;h=e14ba0c40c4c01d89bc08ed804a4befa41ab44b2;hb=5e61c7330cb2e0ff39e0bf4ba7b65d1d26c824ac;hp=4ebed737eae184c7d4058d465bd705628f3c315c;hpb=a21e7cd1a2021e45091f693777ce046fdd3fb55c;p=tools%2Fconfiguration.git diff --git a/cmake/FindSalomeSWIG.cmake b/cmake/FindSalomeSWIG.cmake index 4ebed73..e14ba0c 100644 --- a/cmake/FindSalomeSWIG.cmake +++ b/cmake/FindSalomeSWIG.cmake @@ -1,4 +1,4 @@ -# Copyright (C) 2013-2016 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2013-2022 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -26,9 +26,12 @@ # 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) +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 NO_CMAKE_PATH) +IF(WIN32) + SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(SWIG SWIG_EXECUTABLE 1) +ELSE() + SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(SWIG SWIG_EXECUTABLE 2) +ENDIF() MARK_AS_ADVANCED(SWIG_EXECUTABLE SWIG_VERSION) IF(SWIG_FOUND)