From 0ee1f9c2c37768e5eb207fde05a001e1f292c667 Mon Sep 17 00:00:00 2001
From: acrovato <a.crovato@uliege.be>
Date: Wed, 27 Apr 2022 12:22:07 +0200
Subject: [PATCH] Update to ubuntu22 and min. cmake 3.14
---
CMakeLists.txt | 23 +++++++----------------
dart/_src/CMakeLists.txt | 37 ++++++++++---------------------------
ext/amfe | 2 +-
3 files changed, 18 insertions(+), 44 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c342e27..ec130f6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,11 +15,7 @@
# ----------------------------------------------------------------------------
PROJECT(DARTFlo)
# ----------------------------------------------------------------------------
-CMAKE_MINIMUM_REQUIRED(VERSION 3.1)
-IF(${CMAKE_VERSION} VERSION_GREATER "3.14.0") # we might want to update the project and use the NEW behavior here
- cmake_policy(SET CMP0078 OLD)
- cmake_policy(SET CMP0086 OLD)
-ENDIF()
+CMAKE_MINIMUM_REQUIRED(VERSION 3.14)
# -- I/O
# Lib/Exe dir
@@ -60,17 +56,12 @@ ENDIF()
# -- DEPENDENCIES
# Python
-IF (CMAKE_VERSION VERSION_LESS 3.12.0)
- FIND_PACKAGE(PythonInterp 3.6 REQUIRED)
- FIND_PACKAGE(PythonLibs 3.6 REQUIRED)
-ELSE()
- FIND_PACKAGE(Python3 COMPONENTS Interpreter Development)
- # use Python3_ROOT_DIR if wrong python found (e.g. anaconda)
- SET(PYTHON_EXECUTABLE ${Python3_EXECUTABLE})
- SET(PYTHON_LIBRARIES ${Python3_LIBRARIES})
- SET(PYTHON_INCLUDE_PATH ${Python3_INCLUDE_DIRS})
- SET(PYTHONLIBS_VERSION_STRING ${Python3_VERSION})
-ENDIF()
+# use Python3_ROOT_DIR if wrong python found (e.g. anaconda)
+FIND_PACKAGE(Python3 COMPONENTS Interpreter Development)
+SET(PYTHON_EXECUTABLE ${Python3_EXECUTABLE})
+SET(PYTHON_LIBRARIES ${Python3_LIBRARIES})
+SET(PYTHON_INCLUDE_PATH ${Python3_INCLUDE_DIRS})
+SET(PYTHONLIBS_VERSION_STRING ${Python3_VERSION})
# SWIG
FIND_PACKAGE(SWIG REQUIRED)
diff --git a/dart/_src/CMakeLists.txt b/dart/_src/CMakeLists.txt
index c78c464..9cbe7ff 100644
--- a/dart/_src/CMakeLists.txt
+++ b/dart/_src/CMakeLists.txt
@@ -19,34 +19,17 @@ INCLUDE(${SWIG_USE_FILE})
FILE(GLOB SRCS *.h *.cpp *.inl *.swg)
FILE(GLOB ISRCS *.i)
-SET(CMAKE_SWIG_FLAGS "")
SET_SOURCE_FILES_PROPERTIES(${ISRCS} PROPERTIES CPLUSPLUS ON)
+SET(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)
-SET(SWINCFLAGS
--I${PROJECT_SOURCE_DIR}/dart/src
--I${PROJECT_SOURCE_DIR}/ext/amfe/fwk/src
--I${PROJECT_SOURCE_DIR}/ext/amfe/fwk/_src
--I${PROJECT_SOURCE_DIR}/ext/amfe/tbox/src
--I${PROJECT_SOURCE_DIR}/ext/amfe/tbox/_src
-)
-SET_SOURCE_FILES_PROPERTIES(${ISRCS} PROPERTIES SWIG_FLAGS "${SWINCFLAGS}")
-
-if (${CMAKE_VERSION} VERSION_LESS "3.8.0")
- SWIG_ADD_MODULE(dartw python ${ISRCS} ${SRCS})
-else()
- SWIG_ADD_LIBRARY(dartw LANGUAGE python SOURCES ${ISRCS} ${SRCS})
-endif()
-MACRO_DebugPostfix(_dartw)
-
-TARGET_INCLUDE_DIRECTORIES(_dartw PRIVATE ${PROJECT_SOURCE_DIR}/dart/_src
- ${PROJECT_SOURCE_DIR}/ext/amfe/fwk/_src
- ${PROJECT_SOURCE_DIR}/ext/amfe/tbox/_src
- ${PYTHON_INCLUDE_PATH}
-)
-
-SWIG_LINK_LIBRARIES(dartw
- dart tbox fwk ${PYTHON_LIBRARIES}
-)
+TARGET_INCLUDE_DIRECTORIES(dartw PRIVATE ${PROJECT_SOURCE_DIR}/dart/_src
+ ${PROJECT_SOURCE_DIR}/ext/amfe/tbox/_src
+ ${PROJECT_SOURCE_DIR}/ext/amfe/fwk/_src
+ ${PYTHON_INCLUDE_PATH})
+TARGET_LINK_LIBRARIES(dartw PRIVATE dart tbox fwk ${PYTHON_LIBRARIES})
INSTALL(FILES ${EXECUTABLE_OUTPUT_PATH}/\${BUILD_TYPE}/dartw.py DESTINATION ${CMAKE_INSTALL_PREFIX})
-INSTALL(TARGETS _dartw DESTINATION ${CMAKE_INSTALL_PREFIX})
+INSTALL(TARGETS dartw DESTINATION ${CMAKE_INSTALL_PREFIX})
diff --git a/ext/amfe b/ext/amfe
index 8a20b0f..36c915f 160000
--- a/ext/amfe
+++ b/ext/amfe
@@ -1 +1 @@
-Subproject commit 8a20b0f157021fc286fa14bb9099fba81092da5c
+Subproject commit 36c915f4ef147a9ead9a6567ef1000e8d822c2bc
--
GitLab