Merge pull request #2 from fredroy/refresh_v2206

Update for v23.06

Author: alxbilger

.github/workflows/ci.yml

@@ -29,8 +29,9 @@ jobs:
       
       - name: Setup SOFA and environment
         id: sofa
-        uses: sofa-framework/sofa-setup-action@v3.0
+        uses: sofa-framework/sofa-setup-action@v4
         with:
+          sofa_scope: 'standard'
           sofa_root: ${{ github.workspace }}/sofa
           sofa_version: ${{ matrix.sofa_branch }}
 

CMakeLists.txt

@@ -3,9 +3,10 @@ project(PluginExample VERSION 1.0 LANGUAGES CXX)
 
 # Find and load CMake configuration of packages containing this plugin's dependencies
 ## Mandatory dependencies
-find_package(SofaBase REQUIRED) # Dependency to SofaBaseVisual
+find_package(Sofa.Component.Visual REQUIRED) # Needed for VisualModelImpl
+
 ## Optional dependencies
-sofa_find_package(SofaGui) # Dependency to SofaGuiQt
+sofa_find_package(Sofa.GUI.Qt)
 sofa_find_package(Qt5 COMPONENTS Core) # Dependency to Qt5Core (needed for qt5_wrap_cpp)
 
 # List all files
@@ -32,7 +33,7 @@ set(README_FILES
     README.md
     )
 
-if(Qt5Core_FOUND AND SofaGui_FOUND)
+if(Qt5Core_FOUND AND Sofa.GUI.Qt_FOUND)
     message(STATUS "GUI components have been detected, enable GUI-related components")
     list(APPEND HEADER_FILES_TO_MOC
         ${PLUGINEXAMPLE_SRC_DIR}/MyDataWidgetUnsigned.h
@@ -50,10 +51,10 @@ endif()
 add_library(${PROJECT_NAME} SHARED ${HEADER_FILES_TO_MOC} ${MOCCED_HEADER_FILES} ${HEADER_FILES} ${SOURCE_FILES} ${README_FILES})
 
 # Link the plugin library to its dependency(ies).
-target_link_libraries(${PROJECT_NAME} SofaBaseVisual)
+target_link_libraries(${PROJECT_NAME} Sofa.Component.Visual)
 # Link with the optional GUI dependencies.
-if(Qt5Core_FOUND AND SofaGui_FOUND)
-    target_link_libraries(${PROJECT_NAME} SofaGuiQt)
+if(Qt5Core_FOUND AND Sofa.GUI.Qt_FOUND)
+    target_link_libraries(${PROJECT_NAME} Sofa.GUI.Qt)
 endif()
 
 # Create package Config, Version & Target files.

PluginExampleConfig.cmake.in

@@ -3,15 +3,15 @@
 @PACKAGE_GUARD@
 @PACKAGE_INIT@
 
-set(PLUGINEXAMPLE_HAVE_SOFAGUI @PLUGINEXAMPLE_HAVE_SOFAGUI@)
-set(PLUGINEXAMPLE_HAVE_QT5CORE @PLUGINEXAMPLE_HAVE_QT5CORE@)
+set(PLUGINEXAMPLE_HAVE_SOFA_GUI_QT @PLUGINEXAMPLE_HAVE_SOFA_GUI_QT@)
+set(PLUGINEXAMPLE_HAVE_QT5_CORE @PLUGINEXAMPLE_HAVE_QT5_CORE@)
 
-find_package(SofaBase QUIET REQUIRED)
+find_package(Sofa.Component.Visual QUIET REQUIRED)
 
-if(PLUGINEXAMPLE_HAVE_SOFAGUI)
-    find_package(SofaGui QUIET REQUIRED)
+if(PLUGINEXAMPLE_HAVE_SOFA_GUI_QT)
+    find_package(Sofa.GUI.Qt QUIET REQUIRED)
 endif()
-if(PLUGINEXAMPLE_HAVE_QT5CORE)
+if(PLUGINEXAMPLE_HAVE_QT5_CORE)
     find_package(Qt5 COMPONENTS Core QUIET REQUIRED)
 endif()
 

src/PluginExample/MyVisualModel.cpp

@@ -24,7 +24,7 @@
 #include <sofa/core/ObjectFactory.h>
 
 
-namespace sofa::component::visualmodel
+namespace sofa::component::visual
 {
 
 MyVisualModel::MyVisualModel()
@@ -47,5 +47,5 @@ void MyVisualModel::reinit()
 int MyVisualModelClass = core::RegisterObject("Dummy visual component.").add< MyVisualModel >();
 
 
-} // namespace sofa::component::visualmodel
+} // namespace sofa::component::visual
 

src/PluginExample/MyVisualModel.h

@@ -27,7 +27,7 @@
 #include <sofa/component/visual/VisualModelImpl.h>
 
 
-namespace sofa::component::visualmodel
+namespace sofa::component::visual
 {
 
 /**
@@ -53,5 +53,5 @@ class SOFA_PLUGINEXAMPLE_API MyVisualModel : public sofa::component::visual::Vis
 };
 
 
-} // sofa::component::visualmodel
+} // sofa::component::visual