From c5358ba08b6dbab88fd9e326f06bca4e6e015dd6 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@uliege.be>
Date: Mon, 3 Jan 2022 23:26:50 +0100
Subject: [PATCH] copy Eigen in private_api headers if necessary
---
CMakeLists.txt | 12 ++++++++++++
contrib/mobile/Android/build.gradle | 2 +-
contrib/mobile/utils/ios_build.sh | 2 +-
3 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f29b978c2f..a4c0c81754 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1933,6 +1933,12 @@ if(ENABLE_PRIVATE_API)
-E copy_if_different ${FILE} ${CMAKE_CURRENT_BINARY_DIR}/Headers/gmsh/
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
endforeach()
+ if(HAVE_CONTRIB_EIGEN) # the private API depends on Eigen
+ add_custom_command(TARGET get_headers POST_BUILD
+ COMMAND ${CMAKE_COMMAND} -E copy_directory contrib/eigen/Eigen
+ ${CMAKE_CURRENT_BINARY_DIR}/Headers/gmsh/Eigen
+ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+ endif()
endif()
find_program(MAKEINFO makeinfo)
@@ -2010,6 +2016,12 @@ if(APPLE AND ENABLE_BUILD_LIB)
${FILE} ${CMAKE_CURRENT_BINARY_DIR}/gmsh.framework/Headers/
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
endforeach()
+ if(HAVE_CONTRIB_EIGEN) # the private API depends on Eigen
+ add_custom_command(TARGET framework POST_BUILD COMMAND ${CMAKE_COMMAND}
+ -E copy_directory contrib/eigen/Eigen
+ ${CMAKE_CURRENT_BINARY_DIR}/gmsh.framework/Headers/Eigen
+ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+ endif()
endif()
endif()
diff --git a/contrib/mobile/Android/build.gradle b/contrib/mobile/Android/build.gradle
index fc82e6802c..97a66602a8 100644
--- a/contrib/mobile/Android/build.gradle
+++ b/contrib/mobile/Android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
jcenter()
}
dependencies {
- classpath 'com.android.tools.build:gradle:4.0.0'
+ classpath 'com.android.tools.build:gradle:7.0.0'
}
}
diff --git a/contrib/mobile/utils/ios_build.sh b/contrib/mobile/utils/ios_build.sh
index 212c57aa09..ebe8b4980d 100755
--- a/contrib/mobile/utils/ios_build.sh
+++ b/contrib/mobile/utils/ios_build.sh
@@ -99,7 +99,7 @@ $headers_cmd
mkdir -p $gmsh_framework/Headers
cp $gmsh_git/build_${ios}/${buildtype}-${iphoneos}/libgmsh.a $gmsh_framework/gmsh
cd $gmsh_framework/Headers
-cp $gmsh_git/build_${ios}/Headers/*.h $gmsh_git/build_${ios}/Headers/gmsh/* .
+cp -R $gmsh_git/build_${ios}/Headers/*.h $gmsh_git/build_${ios}/Headers/gmsh/* .
ln -s . gmsh
# build getdp framework
--
GitLab