jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'swiglib'

Browse source 
* swiglib:
  CMake: Fix -swiglib on win32
This commit is contained in:
William S Fulton 2022-11-05 10:15:44 +00:00
commit be46d464a9
1 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
CMakeLists.txt
View file

@ -20,8 +20,11 @@ endif ()
set (SWIG_ROOT ${PROJECT_SOURCE_DIR}) set (SWIG_ROOT ${PROJECT_SOURCE_DIR})
set (SWIG_LIB share/swig/${SWIG_VERSION}) if (WIN32)
set (SWIG_LIB bin/Lib)
else ()
set (SWIG_LIB share/swig/${SWIG_VERSION})
endif ()
# Project wide configuration variables # Project wide configuration variables
# ------------------------------------ # ------------------------------------
@ -80,10 +83,10 @@ if (WITH_PCRE)
include_directories (${PCRE2_INCLUDE_DIRS}) include_directories (${PCRE2_INCLUDE_DIRS})
endif() endif()
if (WIN32) #if (WIN32)
file (TO_NATIVE_PATH ${CMAKE_INSTALL_PREFIX}/${SWIG_LIB} SWIG_LIB_WIN_UNIX) # file (TO_NATIVE_PATH ${CMAKE_INSTALL_PREFIX}/${SWIG_LIB} SWIG_LIB_WIN_UNIX)
string (REGEX REPLACE "\\\\" "\\\\\\\\" SWIG_LIB_WIN_UNIX "${SWIG_LIB_WIN_UNIX}") # string (REGEX REPLACE "\\\\" "\\\\\\\\" SWIG_LIB_WIN_UNIX "${SWIG_LIB_WIN_UNIX}")
endif () #endif ()
configure_file (${SWIG_ROOT}/Tools/cmake/swigconfig.h.in configure_file (${SWIG_ROOT}/Tools/cmake/swigconfig.h.in
${CMAKE_CURRENT_BINARY_DIR}/Source/Include/swigconfig.h) ${CMAKE_CURRENT_BINARY_DIR}/Source/Include/swigconfig.h)