sofa-framework · guparan · Sep 26, 2019 · Jul 23, 2019 · Jul 23, 2019 · Jul 30, 2019
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -232,12 +232,7 @@ add_subdirectory(SofaMisc)
 add_subdirectory(SofaGui)
 
 # SofaTest, modules depend on SofaPython, so we add SofaPython before.
-sofa_add_plugin( applications/plugins/SofaPython SofaPython )
-
-## Modules
-## in the consortium convention a module is a similar to a plugin the difference is that
-## a module is hosted and managed by the consortium while plugins are hosted and managed by third parties.
-add_subdirectory(modules)
+sofa_add_plugin(applications/plugins/SofaPython SofaPython)
 
 ## Scene creator option
 option(SOFA_BUILD_SCENECREATOR "Compile the C++ API located in applications/plugins/SceneCreator" OFF)
@@ -253,25 +248,27 @@ endif()
 
 # Library used by SOFA_BUILD_TESTS and SOFA_BUILD_TUTORIALS
 if(SOFA_BUILD_SCENECREATOR)
-    add_subdirectory(applications/plugins/SceneCreator SceneCreator)
+    add_subdirectory(applications/plugins/SceneCreator)
 endif()
 
 # Tests : define subdirectories
 if(SOFA_BUILD_TESTS)
     # Library used to write high level tests involving many components.
-    add_subdirectory(applications/plugins/SofaTest SofaTest)
+    add_subdirectory(applications/plugins/SofaTest)
     # Tests for all the modules, written using SofaTest.
     add_subdirectory(modules/tests)
     # SofaPython_test is a special case, because it depends on
     # SofaTest, which depends on SofaPython...
     if(PLUGIN_SOFAPYTHON)
         add_subdirectory(applications/plugins/SofaPython/SofaPython_test)
     endif()
-
-    # Not sure what is it
-    add_subdirectory(applications/plugins/SofaTest/SofaTest_test)
 endif()
 
+## Modules
+## in the consortium convention a module is a similar to a plugin the difference is that
+## a module is hosted and managed by the consortium while plugins are hosted and managed by third parties.
+add_subdirectory(modules)
+
 ## Plugins
 add_subdirectory(applications/plugins)
 

diff --git a/SofaAdvanced/CMakeLists.txt b/SofaAdvanced/CMakeLists.txt
@@ -3,26 +3,16 @@ project(SofaAdvanced)
 
 ## Dependencies
 find_package(SofaGeneral REQUIRED)
-find_package(MiniFlowVR QUIET)
-set(SOFA_HAVE_MINIFLOWVR ${MiniFlowVR_FOUND})
-set(SOFA_HAVE_FLOWVR ${MiniFlowVR_FOUND}) # cmakedefine
 
 ## Version
 set(SOFAADVANCED_VERSION ${SofaFramework_VERSION})
 
-## SofaAdvanced/config.h
-configure_file(config.h.in "${CMAKE_BINARY_DIR}/include/${PROJECT_NAME}/config.h")
-install(FILES "${CMAKE_BINARY_DIR}/include/${PROJECT_NAME}/config.h" DESTINATION "include/${PROJECT_NAME}/${PROJECT_NAME}" COMPONENT headers)
-
-
-### Subdirectories
-
+## Subdirectories
 set(SOFAADVANCED_TARGETS
-    SofaComponentAdvanced
     SofaNonUniformFem
 )
 
-foreach(TARGET ${SOFAADVANCED_TARGETS})
+foreach(TARGET ${SOFAADVANCED_TARGETS} SofaComponentAdvanced)
     add_subdirectory(../modules/${TARGET} ${CMAKE_CURRENT_BINARY_DIR}/${TARGET})
     target_include_directories(${TARGET} PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../modules>")
     target_include_directories(${TARGET} PUBLIC "$<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/include>")
@@ -32,6 +22,9 @@ foreach(TARGET ${SOFAADVANCED_TARGETS})
     set_target_properties(${TARGET} PROPERTIES VERSION  ${SOFAADVANCED_VERSION})
 endforeach()
 
+## SofaAdvanced/config.h
+configure_file(config.h.in "${CMAKE_BINARY_DIR}/include/${PROJECT_NAME}/config.h")
+install(FILES "${CMAKE_BINARY_DIR}/include/${PROJECT_NAME}/config.h" DESTINATION "include/${PROJECT_NAME}/${PROJECT_NAME}" COMPONENT headers)
 
 ## CMake package configurations files
 sofa_write_package_config_files(SofaAdvanced ${SOFAADVANCED_VERSION})
diff --git a/SofaAdvanced/SofaAdvancedConfig.cmake.in b/SofaAdvanced/SofaAdvancedConfig.cmake.in
@@ -4,14 +4,11 @@
 
 find_package(SofaGeneral REQUIRED)
 
-set(SOFA_HAVE_MINIFLOWVR @SOFA_HAVE_MINIFLOWVR@)
-
-if(SOFA_HAVE_MINIFLOWVR)
-    find_package(MiniFlowVR REQUIRED)
-endif()
-
-if(NOT TARGET SofaComponentAdvanced)
-	include("${CMAKE_CURRENT_LIST_DIR}/SofaAdvancedTargets.cmake")
-endif()
-
-check_required_components(@SOFAADVANCED_TARGETS@)
+foreach(target @SOFAADVANCED_TARGETS@ SofaComponentAdvanced)
+    if(NOT TARGET ${target})
+        include("${CMAKE_CURRENT_LIST_DIR}/SofaAdvancedTargets.cmake")
+        break()
+    endif()
+endforeach()
+
+check_required_components(@SOFAADVANCED_TARGETS@ SofaComponentAdvanced)
diff --git a/SofaAdvanced/config.h.in b/SofaAdvanced/config.h.in
@@ -24,8 +24,6 @@
 
 #include <SofaCommon/config.h>
 
-#cmakedefine SOFA_HAVE_FLOWVR
-
 #ifdef SOFA_BUILD_NON_UNIFORM_FEM
 #  define SOFA_TARGET SofaNonUniformFem
 #  define SOFA_NON_UNIFORM_FEM_API SOFA_EXPORT_DYNAMIC_LIBRARY

diff --git a/SofaGeneral/CMakeLists.txt b/SofaGeneral/CMakeLists.txt
@@ -4,20 +4,13 @@ project(SofaGeneral)
 # Send warnings when deprecated CMake project is activated
 option(CMAKE_WARN_DEPRECATED "Send warning when deprecated projects are found" ON)
 
-## Dependencies
+# Dependencies
 find_package(SofaCommon REQUIRED)
-find_package(Newmat)
-set(SOFA_HAVE_NEWMAT ${Newmat_FOUND})
 
-## Version
+# Version
 set(SOFAGENERAL_VERSION ${SofaFramework_VERSION})
 
-## SofaGeneral/config.h
-configure_file(config.h.in "${CMAKE_BINARY_DIR}/include/${PROJECT_NAME}/config.h")
-install(FILES "${CMAKE_BINARY_DIR}/include/${PROJECT_NAME}/config.h" DESTINATION "include/${PROJECT_NAME}/${PROJECT_NAME}" COMPONENT headers)
-
-### Subdirectories
-
+# Subdirectories
 set(SOFAGENERAL_TARGETS
     SofaGeneralAnimationLoop
     SofaGeneralDeformable
@@ -32,7 +25,6 @@ set(SOFAGENERAL_TARGETS
     SofaGeneralTopology
     SofaGeneralVisual
     SofaBoundaryCondition
-    SofaComponentGeneral
     SofaConstraint
     SofaGeneralEngine
     SofaGraphComponent
@@ -41,11 +33,13 @@ set(SOFAGENERAL_TARGETS
     SofaValidation
 )
 
-if(SOFA_HAVE_NEWMAT)
+find_package(Newmat QUIET)
+if(Newmat_FOUND)
     list(APPEND SOFAGENERAL_TARGETS SofaDenseSolver)
 endif()
+sofa_set_bool(SOFAGENERAL_HAVE_SOFADENSESOLVER VALUE ${Newmat_FOUND})
 
-foreach(TARGET ${SOFAGENERAL_TARGETS})
+foreach(TARGET ${SOFAGENERAL_TARGETS} SofaComponentGeneral)
     add_subdirectory(../modules/${TARGET} ${CMAKE_CURRENT_BINARY_DIR}/${TARGET})
     target_include_directories(${TARGET} PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../modules>")
     target_include_directories(${TARGET} PUBLIC "$<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/include>")
@@ -55,6 +49,9 @@ foreach(TARGET ${SOFAGENERAL_TARGETS})
     set_target_properties(${TARGET} PROPERTIES VERSION  ${SOFAGENERAL_VERSION})
 endforeach()
 
+# SofaGeneral/config.h
+configure_file(config.h.in "${CMAKE_BINARY_DIR}/include/${PROJECT_NAME}/config.h")
+install(FILES "${CMAKE_BINARY_DIR}/include/${PROJECT_NAME}/config.h" DESTINATION "include/${PROJECT_NAME}/${PROJECT_NAME}" COMPONENT headers)
 
-## CMake package configurations files
+# CMake package configurations files
 sofa_write_package_config_files(SofaGeneral ${SOFAGENERAL_VERSION})
diff --git a/SofaGeneral/SofaGeneralConfig.cmake.in b/SofaGeneral/SofaGeneralConfig.cmake.in
@@ -2,17 +2,24 @@
 
 @PACKAGE_INIT@
 
-find_package(SofaCommon REQUIRED)
+set(SOFAGENERAL_HAVE_SOFADENSESOLVER @SOFAGENERAL_HAVE_SOFADENSESOLVER@)
+set(SOFADENSESOLVER_HAVE_NEWMAT @SOFADENSESOLVER_HAVE_NEWMAT@)
+set(SOFAGENERALLOADER_HAVE_ZLIB @SOFAGENERALLOADER_HAVE_ZLIB@)
 
-set(SOFA_HAVE_NEWMAT @SOFA_HAVE_NEWMAT@)
-set(SOFA_HAVE_PARDISO @SOFA_HAVE_PARDISO@)
+find_package(SofaCommon REQUIRED)
 
-if(SOFA_HAVE_NEWMAT)
-    find_package(Newmat REQUIRED)
+if(SOFADENSESOLVER_HAVE_NEWMAT)
+    find_package(Newmat QUIET REQUIRED)
 endif()
-
-if(NOT TARGET SofaComponentGeneral)
-	include("${CMAKE_CURRENT_LIST_DIR}/SofaGeneralTargets.cmake")
+if(SOFAGENERALLOADER_HAVE_ZLIB)
+    find_package(ZLIB QUIET REQUIRED)
 endif()
 
-check_required_components(@SOFAGENERAL_TARGETS@)
+foreach(target @SOFAGENERAL_TARGETS@ SofaComponentGeneral)
+    if(NOT TARGET ${target})
+        include("${CMAKE_CURRENT_LIST_DIR}/SofaGeneralTargets.cmake")
+        break()
+    endif()
+endforeach()
+
+check_required_components(@SOFAGENERAL_TARGETS@ SofaComponentGeneral)
diff --git a/SofaGeneral/config.h.in b/SofaGeneral/config.h.in
@@ -24,8 +24,7 @@
 
 #include <SofaCommon/config.h>
 
-#cmakedefine SOFA_HAVE_NEWMAT
-#cmakedefine SOFA_HAVE_PARDISO
+#define SOFAGENERAL_HAVE_SOFADENSESOLVER ${SOFAGENERAL_HAVE_SOFADENSESOLVER}
 
 #ifdef SOFA_BUILD_GENERAL_DEFORMABLE
 #  define SOFA_TARGET SofaGeneralDeformable
@@ -174,21 +173,17 @@
 #  define SOFA_CONSTRAINT_API SOFA_IMPORT_DYNAMIC_LIBRARY
 #endif
 
-#ifdef SOFA_HAVE_NEWMAT
-#  ifdef SOFA_BUILD_DENSE_SOLVER
-#    define SOFA_TARGET SofaDenseSolver
-#    define SOFA_DENSE_SOLVER_API SOFA_EXPORT_DYNAMIC_LIBRARY
-#  else
-#    define SOFA_DENSE_SOLVER_API SOFA_IMPORT_DYNAMIC_LIBRARY
-#  endif
+#ifdef SOFA_BUILD_DENSE_SOLVER
+#  define SOFA_TARGET SofaDenseSolver
+#  define SOFA_DENSE_SOLVER_API SOFA_EXPORT_DYNAMIC_LIBRARY
+#else
+#  define SOFA_DENSE_SOLVER_API SOFA_IMPORT_DYNAMIC_LIBRARY
 #endif
 
-#ifdef SOFA_HAVE_PARDISO
 #ifdef SOFA_BUILD_PARDISO_SOLVER
 #  define SOFA_PARDISO_SOLVER_API SOFA_EXPORT_DYNAMIC_LIBRARY
 #else
 #  define SOFA_PARDISO_SOLVER_API SOFA_IMPORT_DYNAMIC_LIBRARY
 #endif
-#endif
 
 #endif
diff --git a/SofaGui/CMakeLists.txt b/SofaGui/CMakeLists.txt
@@ -8,25 +8,6 @@ find_package(SofaGeneral REQUIRED)
 find_package(SofaMisc REQUIRED)
 find_package(SofaAdvanced REQUIRED)
 
-option(SOFA_NO_QT "Force Sofa to not take into account the Qt library" OFF)
-
-if(NOT SOFA_NO_QT)
-    ## Qt5
-    set(QT_USE_IMPORTED_TARGETS 1)
-
-    # Search for Qt to see if we can auto-enable stuff
-    find_package(Qt5 COMPONENTS Core QUIET)
-
-    ## Thoses variables are used in SofaGuiConfig.cmake.in
-    if(Qt5_FOUND)
-        set(SOFA_HAVE_QT 1)
-    endif()
-    set(SOFA_QT5 ${Qt5_FOUND})
-else()
-    set(SOFA_HAVE_QT 0)
-    set(SOFA_QT5 0)
-endif(NOT SOFA_NO_QT)
-
 set(SOFAGUI_TARGETS "")
 
 ## Version
@@ -44,87 +25,24 @@ endif()
 add_subdirectory(../applications/sofa/gui/SofaGuiCommon ${CMAKE_CURRENT_BINARY_DIR}/SofaGuiCommon)
 list(APPEND SOFAGUI_TARGETS SofaGuiCommon)
 
-if(NOT SOFA_NO_QT)
-    ## Qt GUI
-    # Check if Qt(4/5) is present ; if not, disable ability to compile Qt things
-    set(SOFA_HAVE_QT_LIBRARIES 1)
-    find_package(Qt5 COMPONENTS Core QUIET)
-    if(NOT Qt5Core_FOUND)
-        set(SOFA_HAVE_QT_LIBRARIES 0)
+## SofaGuiQt
+option(SOFAGUI_QT "Compile the Qt GUI" ON)
+if(SOFAGUI_QT)
+    list(APPEND SOFAGUI_TARGETS SofaGuiQt)
+    add_subdirectory(../applications/sofa/gui/qt ${CMAKE_CURRENT_BINARY_DIR}/SofaGuiQt)
+endif()
+sofa_set_bool(SOFAGUI_HAVE_SOFAGUIQT VALUE ${SOFAGUI_QT}) # see config.h.in
+
+## OpenGL-based GUIs
+if(NOT SOFA_NO_OPENGL)
+    ## SofaHeadlessRecorder
+    option(SOFAGUI_HEADLESS_RECORDER "Compile the headless recorder (Linux only)" OFF)
+    if(SOFAGUI_HEADLESS_RECORDER)
+        list(APPEND SOFAGUI_TARGETS SofaHeadlessRecorder)
+        add_subdirectory(../applications/sofa/gui/headlessRecorder ${CMAKE_CURRENT_BINARY_DIR}/SofaHeadlessRecorder)
     endif()
-
-    if(SOFA_HAVE_QT_LIBRARIES)
-        option(SOFAGUI_QT "Compile the Qt GUI" ON)
-        if(SOFAGUI_QT)
-
-            ## Qt GUI options, used in the relevant CMakeLists.txt
-            ## VSync
-            option(SOFAGUI_ENABLE_VSYNC "Enable vertical refresh sync" OFF)
-            if(SOFAGUI_ENABLE_VSYNC)
-                set(SOFA_GUI_VSYNC_ 1) # config.h.in
-            else()
-                set(SOFA_GUI_VSYNC_ 0) # config.h.in
-            endif()
-
-            ## QWT
-            option(SOFAGUI_ENABLE_QWT "Enable QWT for Qt GUIs")
-            if(SOFAGUI_ENABLE_QWT)
-                set(SOFA_HAVE_QWT 1) # cmakedefine
-            endif()
-
-            ## Qt native menu
-            set(DEFAULT_SOFAGUI_ENABLE_NATIVE_MENU ON)
-            if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-                set(DEFAULT_SOFAGUI_ENABLE_NATIVE_MENU OFF)
-            endif()
-
-            option(SOFAGUI_ENABLE_NATIVE_MENU "Enable Qt to use the operating system's native menu for the Qt GUI" ${DEFAULT_SOFAGUI_ENABLE_NATIVE_MENU})
-            if(SOFAGUI_ENABLE_NATIVE_MENU)
-                set(SOFA_GUI_NATIVE_MENU 1)
-            endif()
-
-            set(SOFA_GUI_QT 1) # cmakedefine
-            list(APPEND SOFAGUI_TARGETS SofaGuiQt)
-            add_subdirectory(../applications/sofa/gui/qt ${CMAKE_CURRENT_BINARY_DIR}/SofaGuiQt)
-        endif(SOFAGUI_QT)
-
-        # Qt things with OpenGL deps
-        if(NOT SOFA_NO_OPENGL)
-
-            option(SOFAGUI_HEADLESS_RECORDER "Compile the headless recorder (Linux only)" OFF)
-            if(SOFAGUI_HEADLESS_RECORDER)
-                set(SOFA_GUI_HEADLESS_RECORDER 1) # cmakedefine
-                list(APPEND SOFAGUI_TARGETS SofaHeadlessRecorder)
-                add_subdirectory(../applications/sofa/gui/headlessRecorder ${CMAKE_CURRENT_BINARY_DIR}/SofaHeadlessRecorder)
-            endif(SOFAGUI_HEADLESS_RECORDER)
-
-            if(SOFAGUI_QT)
-                set(SOFA_GUI_QT_OPENGL 1) # cmakedefine
-                list(APPEND SOFAGUI_TARGETS SofaGuiQtOpenGL)
-                add_subdirectory(../applications/sofa/gui/qt/gl ${CMAKE_CURRENT_BINARY_DIR}/SofaGuiQtOpenGL)
-
-                ## QtViewer
-                option(SOFAGUI_QTVIEWER "Compile the QtViewer for the Qt GUI" ON)
-                if(SOFAGUI_QTVIEWER)
-                    set(SOFA_GUI_QTVIEWER 1) # cmakedefine
-                endif()
-
-                ## QglViewer
-                option(SOFAGUI_QGLVIEWER "Compile the QGLViewer for the Qt GUI" ON)
-                if(SOFAGUI_QGLVIEWER)
-                    set(SOFA_GUI_QGLVIEWER 1) # cmakedefine
-                    find_package(QGLViewer QUIET)
-                    if(NOT QGLViewer_FOUND)
-                        add_subdirectory(${CMAKE_SOURCE_DIR}/extlibs/libQGLViewer-2.7.1/QGLViewer ${CMAKE_BINARY_DIR}/extlibs/QGLViewer)
-                    endif()
-                endif()
-
-            endif(SOFAGUI_QT)
-        endif(NOT SOFA_NO_OPENGL)
-    else()
-        message("Cannot find any Qt libraries on your system, please set Qt5_DIR or Qt4_DIR if you want to compile GUIs using Qt")
-    endif(SOFA_HAVE_QT_LIBRARIES)
-endif(NOT SOFA_NO_QT)
+    sofa_set_bool(SOFAGUI_HAVE_SOFAHEADLESSRECORDER VALUE ${SOFAGUI_HEADLESS_RECORDER}) # see config.h.in
+endif()
 
 ## SofaGuiMain
 list(APPEND SOFAGUI_TARGETS SofaGuiMain)