Merge pull request #1086 from gangliao/swig

Find swig in system first
9 years ago · 5c0178b0f2
parent d41ac09090 b49745cd56
commit 5c0178b0f2
2 changed files with 55 additions and 50 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -29,6 +29,7 @@ addons:
      - python-pip
      - python2.7-dev
      - curl
+      - swig
      - graphviz
      - clang-format-3.8
      - automake
--- a/cmake/external/swig.cmake
+++ b/cmake/external/swig.cmake
@ -12,6 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

+FIND_PACKAGE(SWIG)
+
+IF(NOT SWIG_FOUND)
    # build swig as an external project
    INCLUDE(ExternalProject)

@ -68,3 +71,4 @@ ELSE(WIN32)
    ENDIF(WIN32)

    LIST(APPEND external_project_dependencies swig)
+ENDIF(NOT SWIG_FOUND)