Skip to content

Commit

Permalink
Avoiding BUILD_SWIG on mac if swig is found and >= v3.0.3
Browse files Browse the repository at this point in the history
  • Loading branch information
axelstudios committed Feb 10, 2015
1 parent cbf8a40 commit b9551d1
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -420,10 +420,10 @@ mark_as_advanced(
SWIG_VERSION
)

# Currently MacOS and/or V8 require special builds
# as of 2014-06-04. This should be re-checked after swig > 3.0.2 is released.
# Currently MacOS (with swig < 3.0.3) and V8 require special builds
# as of 2015-02-05. This should be re-checked after swig > 3.0.5 is released.
# 64-bit MSVC also requires BUILD_SWIG
if(SWIG_FOUND AND NOT BUILD_V8_BINDINGS AND NOT APPLE AND NOT (WIN32 AND MSVC AND CMAKE_CL_64))
if(SWIG_FOUND AND NOT BUILD_V8_BINDINGS AND NOT (APPLE AND ${SWIG_VERSION} VERSION_LESS "3.0.3") AND NOT (WIN32 AND MSVC AND CMAKE_CL_64))
option(BUILD_SWIG "Build SWIG" OFF)
else()
option(BUILD_SWIG "Build SWIG" ON)
Expand Down

7 comments on commit b9551d1

@nrel-bot
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

iteration (axelstudios) - x86_64-MacOS-10.9-clang: OK (2172 of 2192 tests passed)

Build Badge Test Badge

@nrel-bot
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

develop (axelstudios) - x86_64-Linux-Ubuntu-14.04-clang-3.5: OK (2164 of 2192 tests passed)

Build Badge Test Badge

@nrel-bot
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

develop (axelstudios) - x86_64-Linux-Ubuntu-14.04-cppcheck-1.61: OK (0 of 0 tests passed)

Build Badge

@nrel-bot
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

iteration (axelstudios) - x86_64-Linux-Ubuntu-14.04-clang-3.5: OK (2075 of 2192 tests passed)

Build Badge Test Badge

@nrel-bot
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

iteration (axelstudios) - x86_64-Linux-Ubuntu-14.04-cppcheck-1.61: OK (0 of 0 tests passed)

Build Badge

@nrel-bot
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

iteration (axelstudios) - i386-Windows-7-VisualStudio-12: OK (2179 of 2192 tests passed)

Build Badge Test Badge

@nrel-bot
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

iteration (axelstudios) - Win64-Windows-7-VisualStudio-12: OK (2179 of 2192 tests passed)

Build Badge Test Badge

Please sign in to comment.