From 183dc3c4476675c2c3daa3ebb0c27383a7b0ed9a Mon Sep 17 00:00:00 2001 From: acrovato <a.crovato@uliege.be> Date: Thu, 13 Oct 2022 16:58:14 +0200 Subject: [PATCH] Retain SWIG flags in CMake --- dart/_src/CMakeLists.txt | 2 +- ext/amfe | 2 +- vii/_src/CMakeLists.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dart/_src/CMakeLists.txt b/dart/_src/CMakeLists.txt index 9cbe7ff..3f94e06 100644 --- a/dart/_src/CMakeLists.txt +++ b/dart/_src/CMakeLists.txt @@ -20,7 +20,7 @@ FILE(GLOB SRCS *.h *.cpp *.inl *.swg) FILE(GLOB ISRCS *.i) SET_SOURCE_FILES_PROPERTIES(${ISRCS} PROPERTIES CPLUSPLUS ON) -SET(CMAKE_SWIG_FLAGS "-interface" "_dartw") # avoids "import _module_d" with MSVC/Debug +SET(CMAKE_SWIG_FLAGS ${CMAKE_SWIG_FLAGS} "-interface" "_dartw") # avoids "import _module_d" with MSVC/Debug SWIG_ADD_LIBRARY(dartw LANGUAGE python SOURCES ${ISRCS} ${SRCS}) SET_PROPERTY(TARGET dartw PROPERTY SWIG_USE_TARGET_INCLUDE_DIRECTORIES ON) MACRO_DebugPostfix(dartw) diff --git a/ext/amfe b/ext/amfe index 72c873b..7b5a21b 160000 --- a/ext/amfe +++ b/ext/amfe @@ -1 +1 @@ -Subproject commit 72c873b118e967a5dfbc2cbb4493f080be261752 +Subproject commit 7b5a21b0c5fc3885a11e98ebc2e5acbd19bc55bf diff --git a/vii/_src/CMakeLists.txt b/vii/_src/CMakeLists.txt index c49de25..e00df4b 100644 --- a/vii/_src/CMakeLists.txt +++ b/vii/_src/CMakeLists.txt @@ -20,7 +20,7 @@ FILE(GLOB SRCS *.h *.cpp *.inl *.swg) FILE(GLOB ISRCS *.i) SET_SOURCE_FILES_PROPERTIES(${ISRCS} PROPERTIES CPLUSPLUS ON) -SET(CMAKE_SWIG_FLAGS "-interface" "_viiw") # avoids "import _module_d" with MSVC/Debug +SET(CMAKE_SWIG_FLAGS ${CMAKE_SWIG_FLAGS} "-interface" "_viiw") # avoids "import _module_d" with MSVC/Debug SWIG_ADD_LIBRARY(viiw LANGUAGE python SOURCES ${ISRCS} ${SRCS}) SET_PROPERTY(TARGET viiw PROPERTY SWIG_USE_TARGET_INCLUDE_DIRECTORIES ON) MACRO_DebugPostfix(viiw) -- GitLab