sofa-framework · epernod · Nov 4, 2019 · Sep 20, 2019 · Oct 24, 2019 · Oct 24, 2019
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -8,12 +8,9 @@ set(Sofa_VERSION_PATCH 99)
 set(Sofa_VERSION ${Sofa_VERSION_MAJOR}.${Sofa_VERSION_MINOR}.${Sofa_VERSION_PATCH})
 
 set(SOFA_KERNEL_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/SofaKernel" CACHE STRING "Path to SofaKernel")
-
-if(NOT EXISTS ${SOFA_KERNEL_SOURCE_DIR}/framework)
-    set(SOFA_KERNEL_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/SofaKernel")
-    if(NOT EXISTS ${SOFA_KERNEL_SOURCE_DIR}/framework)
-        message( FATAL_ERROR "SofaKernel is not present or is inaccessible. Check if ${SOFA_KERNEL_SOURCE_DIR} exists or is accessible.")
-    endif()
+if(NOT EXISTS ${SOFA_KERNEL_SOURCE_DIR})
+    message(WARNING "SofaKernel is not present or is inaccessible. Check if ${SOFA_KERNEL_SOURCE_DIR} exists or is accessible. Backing up to default value.")
+    set(SOFA_KERNEL_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/SofaKernel" CACHE STRING "Path to SofaKernel" FORCE)
 endif()
 
 ## Default build type
@@ -270,7 +267,7 @@ add_subdirectory(modules)
 
 if(SOFA_BUILD_TESTS)
     # Tests for all the modules, written using SofaTest.
-    add_subdirectory(modules/tests)
+    add_subdirectory(tests)
     # SofaPython_test is a special case, because it depends on
     # SofaTest, which depends on SofaPython...
     if(PLUGIN_SOFAPYTHON)
@@ -320,17 +317,6 @@ install(FILES "${CMAKE_SOURCE_DIR}/CHANGELOG.md" DESTINATION . COMPONENT applica
 install(FILES "${CMAKE_SOURCE_DIR}/LICENSE.LGPL.txt" DESTINATION . COMPONENT applications)
 install(FILES "${CMAKE_SOURCE_DIR}/Authors.txt" DESTINATION . COMPONENT applications)
 
-# Create build and install versions of etc/sofa.ini:
-#   - In build dir, sofa.ini contains absolute paths to distant (in source) share/ and examples/ dirs
-#   - In install dir, sofa.ini (generated later via installedSofa.ini) contains relative paths to local share/ and examples/ dirs
-set(SHARE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/share")
-set(EXAMPLES_DIR "${CMAKE_CURRENT_SOURCE_DIR}/examples")
-configure_file("${SOFA_KERNEL_SOURCE_DIR}/etc/sofa.ini.in" "${CMAKE_BINARY_DIR}/etc/sofa.ini")
-set(SHARE_DIR "../share/sofa")
-set(EXAMPLES_DIR "../share/sofa/examples")
-configure_file("${SOFA_KERNEL_SOURCE_DIR}/etc/sofa.ini.in" "${CMAKE_BINARY_DIR}/etc/installedSofa.ini")
-install(FILES "${CMAKE_BINARY_DIR}/etc/installedSofa.ini" DESTINATION etc RENAME sofa.ini COMPONENT applications)
-
 option(SOFA_INSTALL_RESOURCES_FILES "Copy resources files (etc/, share/, examples/) when installing" ON)
 ## Install resource files
 if(SOFA_INSTALL_RESOURCES_FILES)

diff --git a/SofaKernel/CMakeLists.txt b/SofaKernel/CMakeLists.txt
diff --git a/SofaKernel/SofaFramework/CMakeLists.txt b/SofaKernel/SofaFramework/CMakeLists.txt
@@ -22,13 +22,10 @@ sofa_set_01(SOFA_WITH_DEPRECATED_COMPONENTS_ VALUE ${SOFA_WITH_DEPRECATED_COMPON
 sofa_set_01(SOFA_NO_UPDATE_BBOX_ VALUE ${SOFA_NO_UPDATE_BBOX}) # build_option_bbox.h.in
 
 # Subdirectories
-add_subdirectory(../framework/sofa/helper ${CMAKE_CURRENT_BINARY_DIR}/SofaHelper)
-add_subdirectory(../framework/sofa/defaulttype ${CMAKE_CURRENT_BINARY_DIR}/SofaDefaultType)
-add_subdirectory(../framework/sofa/core ${CMAKE_CURRENT_BINARY_DIR}/SofaCore)
-add_subdirectory(../framework/sofa/simulation ${CMAKE_CURRENT_BINARY_DIR}/SofaSimulationCore)
-if(SOFA_BUILD_TESTS)
-    add_subdirectory(../framework/framework_test ${CMAKE_CURRENT_BINARY_DIR}/framework_test)
-endif()
+add_subdirectory(../modules/SofaHelper ${CMAKE_CURRENT_BINARY_DIR}/SofaHelper)
+add_subdirectory(../modules/SofaDefaultType ${CMAKE_CURRENT_BINARY_DIR}/SofaDefaultType)
+add_subdirectory(../modules/SofaCore ${CMAKE_CURRENT_BINARY_DIR}/SofaCore)
+add_subdirectory(../modules/SofaSimulationCore ${CMAKE_CURRENT_BINARY_DIR}/SofaSimulationCore)
 
 # Generate & install the different files that contains the defines associated with
 # the state of the build option.
@@ -51,20 +48,18 @@ install(FILES "${CMAKE_BINARY_DIR}/include/sofa/config.h" DESTINATION "include/$
 set(SOFAFRAMEWORK_VERSION "${Sofa_VERSION}")
 set(SOFA_VERSION_STR "\"${Sofa_VERSION}\"")
 set(SOFA_VERSION "${Sofa_VERSION_MAJOR}${Sofa_VERSION_MINOR}${Sofa_VERSION_PATCH}")
-configure_file(../framework/sofa/version.h.in "${CMAKE_BINARY_DIR}/include/sofa/version.h")
+configure_file(version.h.in "${CMAKE_BINARY_DIR}/include/sofa/version.h")
 install(FILES "${CMAKE_BINARY_DIR}/include/sofa/version.h" DESTINATION include/${PROJECT_NAME}/sofa COMPONENT headers)
 
-# IDE folder
-set_target_properties(SofaHelper PROPERTIES FOLDER "SofaFramework")
-set_target_properties(SofaDefaultType PROPERTIES FOLDER "SofaFramework")
-set_target_properties(SofaCore PROPERTIES FOLDER "SofaFramework")
-set_target_properties(SofaSimulationCore PROPERTIES FOLDER "SofaFramework")
-
 # Package install include directory
-set(SOFAFRAMEWORK_TARGETS SofaCore SofaDefaultType SofaHelper)
+set(SOFAFRAMEWORK_TARGETS SofaCore SofaDefaultType SofaHelper SofaSimulationCore)
 foreach(TARGET ${SOFAFRAMEWORK_TARGETS})
+    set_target_properties(${TARGET} PROPERTIES FOLDER "SofaFramework") # IDE folder
     target_include_directories(${TARGET} PUBLIC "$<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/include>")
     target_include_directories(${TARGET} PUBLIC "$<INSTALL_INTERFACE:include/${PROJECT_NAME}>")
+    if(SOFA_BUILD_TESTS)
+        target_compile_options(${TARGET} PUBLIC "-DFRAMEWORK_TEST_RESOURCES_DIR=\"${CMAKE_CURRENT_SOURCE_DIR}/resources/tests\"")
+    endif()
 endforeach()
 
 # CMakeParseLibraryList.cmake

diff --git a/...rk/framework_test/resources/UtilsTest.ini → ...faFramework/resources/tests/UtilsTest.ini b/...rk/framework_test/resources/UtilsTest.ini → ...faFramework/resources/tests/UtilsTest.ini
diff --git a/...k_test/resources/dir with spaces/file.txt → .../resources/tests/dir with spaces/file.txt b/...k_test/resources/dir with spaces/file.txt → .../resources/tests/dir with spaces/file.txt
diff --git a/...resources/dir_é_with_è_accents_à/file.txt → ...ces/tests/dir_é_with_è_accents_à/file.txt b/...resources/dir_é_with_è_accents_à/file.txt → ...ces/tests/dir_é_with_è_accents_à/file.txt
diff --git a/...ework_test/resources/file with spaces.txt → ...work/resources/tests/file with spaces.txt b/...ework_test/resources/file with spaces.txt → ...work/resources/tests/file with spaces.txt
diff --git a/...est/resources/file è with é accents à.txt → ...sources/tests/file è with é accents à.txt b/...est/resources/file è with é accents à.txt → ...sources/tests/file è with é accents à.txt
diff --git a/.../resources/image/imagetest_blackwhite.png → ...rces/tests/image/imagetest_blackwhite.png b/.../resources/image/imagetest_blackwhite.png → ...rces/tests/image/imagetest_blackwhite.png
diff --git a/...est/resources/image/imagetest_noimage.png → ...sources/tests/image/imagetest_noimage.png b/...est/resources/image/imagetest_noimage.png → ...sources/tests/image/imagetest_noimage.png
diff --git a/...k_test/resources/mesh/meshtest_nomesh.obj → .../resources/tests/mesh/meshtest_nomesh.obj b/...k_test/resources/mesh/meshtest_nomesh.obj → .../resources/tests/mesh/meshtest_nomesh.obj
diff --git a/...k_test/resources/mesh/meshtest_nomesh.stl → .../resources/tests/mesh/meshtest_nomesh.stl b/...k_test/resources/mesh/meshtest_nomesh.stl → .../resources/tests/mesh/meshtest_nomesh.stl
diff --git a/...test/resources/mesh/meshtest_uv_n_mtl.mtl → ...esources/tests/mesh/meshtest_uv_n_mtl.mtl b/...test/resources/mesh/meshtest_uv_n_mtl.mtl → ...esources/tests/mesh/meshtest_uv_n_mtl.mtl
diff --git a/...test/resources/mesh/meshtest_uv_n_mtl.obj → ...esources/tests/mesh/meshtest_uv_n_mtl.obj b/...test/resources/mesh/meshtest_uv_n_mtl.obj → ...esources/tests/mesh/meshtest_uv_n_mtl.obj
diff --git a/...rk/framework_test/resources/mesh/test.xs3 → ...faFramework/resources/tests/mesh/test.xs3 b/...rk/framework_test/resources/mesh/test.xs3 → ...faFramework/resources/tests/mesh/test.xs3
@@ -1,14 +1,14 @@
-Xsp 3.0
-numm 6
-nums 5
-mass 1 s 0 0 0 0 0 0 0.1 0
-mass 2 s 1 0 0 0 0 0 0.1 0
-mass 3 s 2 0 0 0 0 0 0.1 0
-mass 4 s 3 0 0 0 0 0 0.1 0
-mass 5 s 4 0 0 0 0 0 0.1 0
-mass 6 s 5 0 0 0 0 0 0.1 0
-lspg 1 1 2 100 1 1
-lspg 2 2 3 100 1 1
-lspg 3 3 4 100 1 1
-lspg 4 4 5 100 1 1
-lspg 5 5 6 100 1 1
+Xsp 3.0
+numm 6
+nums 5
+mass 1 s 0 0 0 0 0 0 0.1 0
+mass 2 s 1 0 0 0 0 0 0.1 0
+mass 3 s 2 0 0 0 0 0 0.1 0
+mass 4 s 3 0 0 0 0 0 0.1 0
+mass 5 s 4 0 0 0 0 0 0.1 0
+mass 6 s 5 0 0 0 0 0 0.1 0
+lspg 1 1 2 100 1 1
+lspg 2 2 3 100 1 1
+lspg 3 3 4 100 1 1
+lspg 4 4 5 100 1 1
+lspg 5 5 6 100 1 1
diff --git a/...rk/framework_test/resources/mesh/test.xs4 → ...faFramework/resources/tests/mesh/test.xs4 b/...rk/framework_test/resources/mesh/test.xs4 → ...faFramework/resources/tests/mesh/test.xs4
@@ -1,14 +1,14 @@
-Xsp 4.0
-numm 6
-nums 5
-mass 1 s 0 0 0 0 0 0 0.1 0
-mass 2 s 1 0 0 0 0 0 0.1 0
-mass 3 s 2 0 0 0 0 0 0.1 0
-mass 4 s 3 0 0 0 0 0 0.1 0
-mass 5 s 4 0 0 0 0 0 0.1 0
-mass 6 s 5 0 0 0 0 0 0.1 0
-lspg 1 1 2 100 1 1 1.1 1.2 1.3
-lspg 2 2 3 100 1 1 2.1 2.2 2.3
-lspg 3 3 4 100 1 1 3.1 3.2 3.3
-lspg 4 4 5 100 1 1 4.1 4.2 4.3
-lspg 5 5 6 100 1 1 5.1 5.2 5.3
+Xsp 4.0
+numm 6
+nums 5
+mass 1 s 0 0 0 0 0 0 0.1 0
+mass 2 s 1 0 0 0 0 0 0.1 0
+mass 3 s 2 0 0 0 0 0 0.1 0
+mass 4 s 3 0 0 0 0 0 0.1 0
+mass 5 s 4 0 0 0 0 0 0.1 0
+mass 6 s 5 0 0 0 0 0 0.1 0
+lspg 1 1 2 100 1 1 1.1 1.2 1.3
+lspg 2 2 3 100 1 1 2.1 2.2 2.3
+lspg 3 3 4 100 1 1 3.1 3.2 3.3
+lspg 4 4 5 100 1 1 4.1 4.2 4.3
+lspg 5 5 6 100 1 1 5.1 5.2 5.3
diff --git a/...t/resources/non-empty-directory/fileA.txt → ...urces/tests/non-empty-directory/fileA.txt b/...t/resources/non-empty-directory/fileA.txt → ...urces/tests/non-empty-directory/fileA.txt
diff --git a/...t/resources/non-empty-directory/fileB.txt → ...urces/tests/non-empty-directory/fileB.txt b/...t/resources/non-empty-directory/fileB.txt → ...urces/tests/non-empty-directory/fileB.txt
diff --git a/...st/resources/non-empty-directory/fileC.so → ...ources/tests/non-empty-directory/fileC.so b/...st/resources/non-empty-directory/fileC.so → ...ources/tests/non-empty-directory/fileC.so
diff --git a/...k/framework_test/resources/shader/test.fs → ...aFramework/resources/tests/shader/test.fs b/...k/framework_test/resources/shader/test.fs → ...aFramework/resources/tests/shader/test.fs
diff --git a/...k/framework_test/resources/shader/test.gs → ...aFramework/resources/tests/shader/test.gs b/...k/framework_test/resources/shader/test.gs → ...aFramework/resources/tests/shader/test.gs
diff --git a/.../framework_test/resources/shader/test.tcs → ...Framework/resources/tests/shader/test.tcs b/.../framework_test/resources/shader/test.tcs → ...Framework/resources/tests/shader/test.tcs
diff --git a/.../framework_test/resources/shader/test.tes → ...Framework/resources/tests/shader/test.tes b/.../framework_test/resources/shader/test.tes → ...Framework/resources/tests/shader/test.tes
diff --git a/...k/framework_test/resources/shader/test.vs → ...aFramework/resources/tests/shader/test.vs b/...k/framework_test/resources/shader/test.vs → ...aFramework/resources/tests/shader/test.vs
diff --git a/SofaKernel/framework/sofa/version.h.in → SofaKernel/SofaFramework/version.h.in b/SofaKernel/framework/sofa/version.h.in → SofaKernel/SofaFramework/version.h.in
diff --git a/SofaKernel/framework/framework_test/CMakeLists.txt b/SofaKernel/framework/framework_test/CMakeLists.txt
diff --git a/SofaKernel/framework/framework_test/core/objectmodel/BaseContext_unittest.cpp b/SofaKernel/framework/framework_test/core/objectmodel/BaseContext_unittest.cpp