[DON’t MERGE YET] Xbraid extension

.circleci/config.yml

@@ -14,14 +14,14 @@ jobs:
       - checkout
       - run:
           name: Configure G+Smo on MacOS
-          command: cmake . -DCMAKE_QUIET=ON -DBUILDNAME="macos_x86_64_xcode10_cxx11_release" -DSITE="$CIRCLE_USERNAME-$CIRCLE_BRANCH [cci]" -DGISMO_INSOURCE_BUILD=ON -DGISMO_BUILD_UNITTESTS=ON -DCMAKE_CXX_STANDARD=11 -DGISMO_WITH_ONURBS=ON
+          command: cmake . -DCMAKE_QUIET=ON -DBUILDNAME="macos_x86_64_xcode11_cxx11_release" -DSITE="$CIRCLE_USERNAME-$CIRCLE_BRANCH [cci]" -DGISMO_INSOURCE_BUILD=ON -DGISMO_BUILD_UNITTESTS=ON -DCMAKE_CXX_STANDARD=11 -DGISMO_WITH_ONURBS=ON
       - run:
           name: Build and test G+Smo on MacOS
           command: ctest -S cmake/ctest_script.cmake -D KEEPCONFIG=ON -D CTEST_BUILD_JOBS=$MAKEJOBS
 
-  macos_x86_64_xcode11_cxx14_release:
+  macos_x86_64_xcode12_cxx14_release:
     macos:
-      xcode: "11.7.0"
+      xcode: "12.5.1"
     working_directory: ~/gismo
     environment:
       MAKEJOBS: 4
@@ -32,12 +32,12 @@ jobs:
       - checkout
       - run:
           name: Configure G+Smo on MacOS
-          command: cmake . -DCMAKE_QUIET=ON -DBUILDNAME="macos_x86_64_xcode11_cxx14_release" -DSITE="$CIRCLE_USERNAME-$CIRCLE_BRANCH [cci]" -DGISMO_INSOURCE_BUILD=ON -DGISMO_BUILD_UNITTESTS=ON -DCMAKE_CXX_STANDARD=14 -DGISMO_WITH_ONURBS=ON
+          command: cmake . -DCMAKE_QUIET=ON -DBUILDNAME="macos_x86_64_xcode12_cxx14_release" -DSITE="$CIRCLE_USERNAME-$CIRCLE_BRANCH [cci]" -DGISMO_INSOURCE_BUILD=ON -DGISMO_BUILD_UNITTESTS=ON -DCMAKE_CXX_STANDARD=14 -DGISMO_WITH_ONURBS=ON
       - run:
           name: Build and test G+Smo on MacOS
           command: ctest -S cmake/ctest_script.cmake -D KEEPCONFIG=ON -D CTEST_BUILD_JOBS=$MAKEJOBS
 
-  macos_x86_64_xcode12_cxx17_release:
+  macos_x86_64_xcode13_cxx17_release:
     macos:
       xcode: "12.5.1"
     working_directory: ~/gismo
@@ -50,7 +50,7 @@ jobs:
       - checkout
       - run:
           name: Configure G+Smo on MacOS
-          command: cmake . -DCMAKE_QUIET=ON -DBUILDNAME="macos_x86_64_xcode12_cxx17_release" -DSITE="$CIRCLE_USERNAME-$CIRCLE_BRANCH [cci]" -DGISMO_INSOURCE_BUILD=ON -DGISMO_BUILD_UNITTESTS=ON -DCMAKE_CXX_STANDARD=17 -DGISMO_WITH_ONURBS=ON
+          command: cmake . -DCMAKE_QUIET=ON -DBUILDNAME="macos_x86_64_xcode13_cxx17_release" -DSITE="$CIRCLE_USERNAME-$CIRCLE_BRANCH [cci]" -DGISMO_INSOURCE_BUILD=ON -DGISMO_BUILD_UNITTESTS=ON -DCMAKE_CXX_STANDARD=17 -DGISMO_WITH_ONURBS=ON
       - run:
           name: Build and test G+Smo on MacOS
           command: ctest -S cmake/ctest_script.cmake -D KEEPCONFIG=ON -D CTEST_BUILD_JOBS=$MAKEJOBS

.github/workflows/gismo.yml

@@ -36,4 +36,4 @@ jobs:
       # Note the current convention is to use the -S and -B options here to specify source 
       # and build directories, but this is only available with CMake 3.13 and higher.  
       # The CMake binaries on the Github Actions machines are (as of this writing) 3.12
-      run: ctest -S gismo/cmake/ctest_script.cmake -D CTEST_BUILD_NAME="actions_$GITHUB_RUN_NUMBER" -D CTEST_SITE="${{ matrix.os }}_[actions]" -D CMAKE_ARGS="-DCMAKE_BUILD_TYPE=$BUILD_TYPE;-DCMAKE_CXX_STANDARD=11;-DGISMO_EXTRA_DEBUG=ON;-DGISMO_WITH_ONURBS=ON;-DGISMO_BUILD_UNITTESTS=ON" -Q
+      run: ctest -S gismo/cmake/ctest_script.cmake -D CTEST_BUILD_NAME="actions_$GITHUB_RUN_NUMBER" -D CTEST_SITE="${{ matrix.os }}_[actions]" -D CMAKE_ARGS="-DCMAKE_BUILD_TYPE=$BUILD_TYPE;-DCMAKE_CXX_STANDARD=14;-DGISMO_EXTRA_DEBUG=ON;-DGISMO_WITH_ONURBS=ON;-DGISMO_BUILD_UNITTESTS=ON" -Q

CMakeLists.txt

@@ -39,13 +39,26 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
 
 if(NOT CMAKE_BUILD_TYPE)
-   # Set default build type to Release
-   set(CMAKE_BUILD_TYPE Release CACHE STRING
-   "Type of build (None Debug Release RelWithDebInfo MinSizeRel)" FORCE)
-   if(NOT CMAKE_CONFIGURATION_TYPES)
-   set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release"
-     "RelWithDebInfo" "MinSizeRel")
-   endif()
+  # Set default build type to Release
+  set(CMAKE_BUILD_TYPE Release CACHE STRING
+  "Type of build (None Debug Release RelWithDebInfo MinSizeRel)" FORCE)
+  if(NOT CMAKE_CONFIGURATION_TYPES)
+    set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release"
+      "RelWithDebInfo" "MinSizeRel")
+  endif()
+endif()
+
+if(NOT CMAKE_CXX_STANDARD)
+  # Set default C++ standard
+  if (NOT CMAKE_CXX_STANDARD_DEFAULT)
+    set(CMAKE_CXX_STANDARD 11 CACHE STRING
+      "C++ standard (98, 11, 14, 17, 20)" FORCE)
+  else()
+    set(CMAKE_CXX_STANDARD ${CMAKE_CXX_STANDARD_DEFAULT} CACHE STRING
+      "C++ standard (98, 11, 14, 17, 20)" FORCE)
+  endif()
+  set_property(CACHE CMAKE_CXX_STANDARD PROPERTY STRINGS "98" "11" "14"
+    "17" "20")
 endif()
 
 set(gismo_VERSION_MAJOR 21) #year
@@ -59,9 +72,9 @@ if(CMAKE_QUIET)
   function(message)
     list(GET ARGV 0 MessageType)
     if(MessageType STREQUAL FATAL_ERROR OR
-	MessageType STREQUAL SEND_ERROR OR
-	MessageType STREQUAL WARNING OR
-	MessageType STREQUAL AUTHOR_WARNING)
+       MessageType STREQUAL SEND_ERROR OR
+       MessageType STREQUAL WARNING OR
+       MessageType STREQUAL AUTHOR_WARNING)
       list(REMOVE_AT ARGV 0)
       _message(${MessageType} "${ARGV}")
     endif()
@@ -269,6 +282,10 @@ if(GISMO_WITH_SMESH)
   #include_directories(${SMESH_INCLUDE_DIR})
 endif()
 
+if(GISMO_WITH_XBRAID)
+  add_subdirectory(extensions/gsXBraid)
+endif(GISMO_WITH_XBRAID)
+
 #second time
 include_directories(${GISMO_INCLUDE_DIRS})