Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update swig to 3.0.12 #1321

Merged
merged 4 commits into from
Jan 17, 2018
Merged

update swig to 3.0.12 #1321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
34b2a84
update swig to 3.0.12
breznak May 23, 2017
f0d2fa3
swig: add fix for 3.0.12 where SWIG_LIB is incorrect on MinGW/Windows
breznak Jan 10, 2018
ee53cc2
Fix Windows build
lscheinkman Jan 17, 2018
b6e00c0
Merge pull request #3 from lscheinkman/pr1321
breznak Jan 17, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
21 changes: 14 additions & 7 deletions external/Swig.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,22 @@
# SWIG_DIR: the directory where swig is installed (.i files, etc.) as defined
# by FindSWIG.

set(swig_path "${REPOSITORY_DIR}/external/common/src/swig-3.0.2.tar.gz")
set(swig_path "${REPOSITORY_DIR}/external/common/src/swig-3.0.12.tar.gz")
set(swigwin_path "${REPOSITORY_DIR}/external/common/src/swigwin-3.0.12.zip")
set(pcre_path "${REPOSITORY_DIR}/external/common/src/pcre-8.37.tar.gz")

if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
# We bundle pre-built Swig for Windows (presumably because we can't build it?)
add_custom_target(Swig)
set(swig_executable
${PROJECT_SOURCE_DIR}/${PLATFORM}${BITNESS}${PLATFORM_SUFFIX}/bin/swig.exe)
set(swig_dir ${PROJECT_SOURCE_DIR}/common/share/swig/3.0.2)
ExternalProject_Add(
Swig
URL ${swigwin_path}
SOURCE_DIR "${EP_BASE}/Install/swig"
UPDATE_COMMAND ""
CONFIGURE_COMMAND ""
BUILD_COMMAND ""
INSTALL_COMMAND ""
)
set(swig_executable ${EP_BASE}/Install/swig/swig.exe)
set(swig_dir ${EP_BASE}/Install/swig/Lib)
else()
# Build Swig from source on non-Windows (e.g., Linux and OS X)
ExternalProject_Add(
Expand All @@ -49,7 +56,7 @@ else()
${EP_BASE}/Source/Swig/configure --prefix=${EP_BASE}/Install --disable-ccache --enable-cpp11-testing
)
set(swig_executable ${EP_BASE}/Install/bin/swig)
set(swig_dir ${EP_BASE}/Install/share/swig/3.0.2)
set(swig_dir ${EP_BASE}/Install/share/swig/3.0.12)
endif()

set(SWIG_EXECUTABLE ${swig_executable} PARENT_SCOPE)
Expand Down
Loading