From a5af8807ee6c87a2c2e69e1ab867b6b414730951 Mon Sep 17 00:00:00 2001 From: Thomas Krijnen Date: Fri, 29 Oct 2021 10:39:02 +0200 Subject: [PATCH] pass config to swig preproc --- cmake/CMakeLists.txt | 5 +++++ src/ifcwrap/CMakeLists.txt | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index 61714a97e5..368f2a33ee 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -144,6 +144,7 @@ ELSE() MESSAGE(FATAL_ERROR "Unable to find JSON for Modern C++ header file, aborting") ENDIF() add_definitions(-DWITH_GLTF) +set(SWIG_DEFINES ${SWIG_DEFINES} -DWITH_GLTF) endif() # Set INSTALL_RPATH for target @@ -200,6 +201,7 @@ find_package(LibXml2 REQUIRED) if (IFCXML_SUPPORT) add_definitions(-DWITH_IFCXML) + set(SWIG_DEFINES ${SWIG_DEFINES} -DWITH_IFCXML) endif() FIND_PACKAGE(Boost REQUIRED COMPONENTS ${BOOST_COMPONENTS}) @@ -371,6 +373,8 @@ IF(COLLADA_SUPPORT) IF(COLLADASWStreamWriter_h) MESSAGE(STATUS "OpenCOLLADA header files found") ADD_DEFINITIONS(-DWITH_OPENCOLLADA) + set(SWIG_DEFINES ${SWIG_DEFINES} -DWITH_OPENCOLLADA) + SET(OPENCOLLADA_LIBRARY_NAMES GeneratedSaxParser MathMLSolver OpenCOLLADABaseUtils OpenCOLLADAFramework OpenCOLLADASaxFrameworkLoader OpenCOLLADAStreamWriter UTF buffer ftoa @@ -462,6 +466,7 @@ if(HDF5_SUPPORT) endif() add_definitions(-DWITH_HDF5) + set(SWIG_DEFINES ${SWIG_DEFINES} -DWITH_HDF5) endif() IF(NOT CMAKE_BUILD_TYPE) diff --git a/src/ifcwrap/CMakeLists.txt b/src/ifcwrap/CMakeLists.txt index 317c4c1c97..150ac6363f 100644 --- a/src/ifcwrap/CMakeLists.txt +++ b/src/ifcwrap/CMakeLists.txt @@ -43,7 +43,7 @@ ENDIF() INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_DIRS}) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -SET(CMAKE_SWIG_FLAGS "") +SET(CMAKE_SWIG_FLAGS ${SWIG_DEFINES}) # NOTE Workaround for most likely missing debug Python libraries on Windows (requires Python built from the source). # Python 3.5 intaller and onwards will have an option to install the debug libraries too. # NOTE PYTHON_DEBUG_LIBRARIES appears to be a deprecated variable