[GeoMechanicsApplication] gtests

CMakeLists.txt

@@ -1,8 +1,10 @@
-cmake_minimum_required (VERSION 2.8.6)
+cmake_minimum_required (VERSION 3.22.0)
+
 project (KratosMultiphysics)
 set (CMAKE_CXX_STANDARD 17)
 set (CMAKE_CXX_STANDARD_REQUIRED ON)
 set (CMAKE_CXX_EXTENSIONS OFF)
+set (USE_MPI OFF)
 
 # Setting some policies
 # No recursive dereferencing
@@ -25,6 +27,11 @@ if(POLICY CMP0057)
   cmake_policy(SET CMP0057 NEW)
 endif(POLICY CMP0057)
 
+# Timestamp for extracted files
+if(POLICY CMP0135)
+  cmake_policy(SET CMP0135 NEW)
+endif(POLICY CMP0135)
+
 # Set here the version number **** only update upon tagging a release!
 set (KratosMultiphysics_MAJOR_VERSION 9)
 set (KratosMultiphysics_MINOR_VERSION 4)
@@ -38,7 +45,7 @@ endif(NOT DEFINED KRATOS_SOURCE_DIR)
 
 if(NOT DEFINED KRATOS_BINARY_DIR)
   message("-- No KRATOS_BINARY_DIR is defined, using: ${CMAKE_BINARY_DIR}")
-  set(KRATOS_BINARY_DIR ${CMAKE_BINARY_DIR})
+  set(KRATOS_BINARY_DIR "${CMAKE_BINARY_DIR}")
 endif(NOT DEFINED KRATOS_BINARY_DIR)
 
 option(REMOVE_INSTALL_DIRECTORIES "Remove the install directories to achieve a clean compilation" ON)
@@ -275,12 +282,25 @@ SET(INSTALL_PYTHON_FILES ON)        # To be removed when all applications are po
 #include the file with custom installation properties
 include(install_function)
 include(KratosDependencies)
+include(FetchContent)
 
 # Logger configuration
 if(KRATOS_COLORED_OUTPUT MATCHES ON)
   add_definitions(-DKRATOS_COLORED_OUTPUT)
 endif(KRATOS_COLORED_OUTPUT MATCHES ON)
 
+# Testing
+if(KRATOS_BUILD_TESTING MATCHES ON)   
+  FetchContent_Declare(
+    googletest
+    URL https://github.com/google/googletest/archive/03597a01ee50ed33e9dfd640b249b4be3799d395.zip
+  )
+  # For Windows: Prevent overriding the parent project's compiler/linker settings
+  set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
+  FetchContent_MakeAvailable(googletest)
+  enable_testing()
+endif(KRATOS_BUILD_TESTING MATCHES ON) 
+
 ################### PYBIND11
 
 # Try to use python executable from env variable
@@ -617,14 +637,12 @@ endif(${USE_TRIANGLE_NONFREE_TPL} MATCHES ON )
 # Compiling the tinyexpr library
 add_subdirectory(${KRATOS_SOURCE_DIR}/external_libraries/tinyexpr)
 
-# Clean the Module and libs install directories
 if(${REMOVE_INSTALL_DIRECTORIES} MATCHES ON )
     install(CODE "message(STATUS \"Deleting: ${CMAKE_INSTALL_PREFIX}/KratosMultiphysics\")")
     install(CODE "file(REMOVE_RECURSE \"${CMAKE_INSTALL_PREFIX}/KratosMultiphysics\")")
     install(CODE "message(STATUS \"Deleting: ${CMAKE_INSTALL_PREFIX}/libs\")")
     install(CODE "file(REMOVE_RECURSE \"${CMAKE_INSTALL_PREFIX}/libs\")")
 endif(${REMOVE_INSTALL_DIRECTORIES} MATCHES ON )
-
 # Install core files for the KratosMultiphysics python module
 kratos_python_install(${INSTALL_PYTHON_USING_LINKS} "${KRATOS_SOURCE_DIR}/kratos/python_interface/__init__.py" "KratosMultiphysics/__init__.py" )
 kratos_python_install(${INSTALL_PYTHON_USING_LINKS} "${KRATOS_SOURCE_DIR}/kratos/python_interface/kratos_globals.py" "KratosMultiphysics/kratos_globals.py" )
@@ -633,8 +651,8 @@ kratos_python_install(${INSTALL_PYTHON_USING_LINKS} "${KRATOS_SOURCE_DIR}/kratos
 kratos_python_install(${INSTALL_PYTHON_USING_LINKS} "${KRATOS_SOURCE_DIR}/kratos/python_interface/python_registry_utilities.py" "KratosMultiphysics/python_registry_utilities.py" )
 
 # Install the libraries in the libs folder
-install(FILES ${Boost_LIBRARIES} DESTINATION libs)
-install(FILES ${EXTRA_INSTALL_LIBS} DESTINATION libs)
+install(FILES ${Boost_LIBRARIES} DESTINATION lib)
+install(FILES ${EXTRA_INSTALL_LIBS} DESTINATION lib)
 
 # Perform post-install tasks (add_subdirectory commands are guaranteed to be executed in order)
 add_subdirectory("scripts/post_install")

applications/CoSimulationApplication/tests/cpp_tests/test_conversion_utilities.cpp

@@ -21,7 +21,7 @@
 #include "custom_utilities/conversion_utilities.h"
 
 // Utilities
-#include "utilities/cpp_tests_utilities.h"
+#include "tests/test_utilities/cpp_tests_utilities.h"
 
 namespace Kratos {
 namespace Testing {

applications/ContactStructuralMechanicsApplication/tests/cpp_tests/utilities/test_contact_utilities.cpp

@@ -18,7 +18,7 @@
 #include "testing/testing.h"
 #include "containers/model.h"
 #include "utilities/variable_utils.h"
-#include "utilities/cpp_tests_utilities.h"
+#include "tests/test_utilities/cpp_tests_utilities.h"
 #include "custom_utilities/contact_utilities.h"
 
 namespace Kratos::Testing

applications/ContactStructuralMechanicsApplication/tests/cpp_tests/utilities/test_interface_preprocess_utilities.cpp

@@ -18,7 +18,7 @@
 #include "testing/testing.h"
 #include "containers/model.h"
 #include "custom_utilities/interface_preprocess.h"
-#include "utilities/cpp_tests_utilities.h"
+#include "tests/test_utilities/cpp_tests_utilities.h"
 
 namespace Kratos::Testing 
 {

applications/GeoMechanicsApplication/CMakeLists.txt

@@ -33,18 +33,26 @@ file(GLOB_RECURSE KRATOS_GEO_MECHANICS_APPLICATION_CORE
     ${CMAKE_CURRENT_SOURCE_DIR}/external_bindings/*.cpp		
 )
 
-## GeoMechanics testing sources
-if(${KRATOS_BUILD_TESTING} MATCHES ON)
-    file(GLOB_RECURSE KRATOS_GEO_MECHANICS_APPLICATION_TESTING_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/tests/*.cpp)
-endif(${KRATOS_BUILD_TESTING} MATCHES ON)
-
 ## GeoMechanics python interface sources
 file(GLOB_RECURSE KRATOS_GEO_MECHANICS_APPLICATION_PYTHON_INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/custom_python/*.cpp)
 
-add_library(KratosGeoMechanicsCore SHARED ${KRATOS_GEO_MECHANICS_APPLICATION_CORE} ${KRATOS_GEO_MECHANICS_APPLICATION_TESTING_SOURCES})
+add_library(KratosGeoMechanicsCore SHARED ${KRATOS_GEO_MECHANICS_APPLICATION_CORE})
 target_link_libraries(KratosGeoMechanicsCore PUBLIC KratosCore KratosStructuralMechanicsCore KratosLinearSolversCore ${CMAKE_DL_LIBS})
 set_target_properties(KratosGeoMechanicsCore PROPERTIES COMPILE_DEFINITIONS "GEO_MECHANICS_APPLICATION=EXPORT,API")
 
+## GeoMechanics testing sources
+if (${KRATOS_BUILD_TESTING} MATCHES ON)
+    file(GLOB_RECURSE KRATOS_GEO_MECHANICS_APPLICATION_TESTING_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/tests/*.cpp)
+
+    add_executable(KratosGeoMechanicsTest ${KRATOS_GEO_MECHANICS_APPLICATION_TESTING_SOURCES})
+
+    target_link_libraries(KratosGeoMechanicsTest PUBLIC KratosGeoMechanicsCore GTest::gtest_main)
+
+    install(TARGETS KratosGeoMechanicsTest)
+
+    include(GoogleTest)
+#    gtest_discover_tests(KratosGeoMechanicsTest)
+endif (${KRATOS_BUILD_TESTING} MATCHES ON)
 
 ###############################################################
 ## define library Kratos which defines the basic python interface
@@ -103,8 +111,8 @@ if(${INSTALL_TESTING_FILES} MATCHES ON )
 endif(${INSTALL_TESTING_FILES} MATCHES ON)
 
 # Install targets
-install(TARGETS KratosGeoMechanicsCore DESTINATION libs )
-install(TARGETS KratosGeoMechanicsApplication DESTINATION libs )
+install(TARGETS KratosGeoMechanicsCore DESTINATION lib )
+install(TARGETS KratosGeoMechanicsApplication DESTINATION lib )
 
 # Define custom targets
 set(KRATOS_KERNEL "${KRATOS_KERNEL};KratosGeoMechanicsCore" PARENT_SCOPE)

applications/GeoMechanicsApplication/custom_utilities/json_process_info_parser.h

@@ -19,7 +19,7 @@
 
 namespace Kratos {
 
-class JsonProcessInfoParser : public ProcessInfoParser
+class KRATOS_API(GEO_MECHANICS_APPLICATION) JsonProcessInfoParser : public ProcessInfoParser
 {
 public:
     std::vector<ProcessParameters> GetProcessList(const Parameters& rProcessParameters) const override;

applications/GeoMechanicsApplication/custom_utilities/parameters_utilities.h

@@ -19,7 +19,7 @@
 namespace Kratos
 {
 
-class ParametersUtilities
+class KRATOS_API(GEO_MECHANICS_APPLICATION) ParametersUtilities
 {
 public:
     static Parameters CopyRequiredParameters(const Parameters& rSourceParameters,

applications/GeoMechanicsApplication/custom_utilities/process_factory.hpp

@@ -25,7 +25,7 @@ namespace Kratos
 
 class Parameters;
 
-class ProcessFactory
+class KRATOS_API(GEO_MECHANICS_APPLICATION) ProcessFactory
 {
 public:
     using ProductType = std::unique_ptr<Process>;

applications/GeoMechanicsApplication/custom_utilities/process_parameters.h

@@ -18,7 +18,7 @@
 namespace Kratos
 {
 
-struct ProcessParameters
+struct KRATOS_API(GEO_MECHANICS_APPLICATION) ProcessParameters
 {
     std::string name;
     Parameters parameters;

applications/GeoMechanicsApplication/custom_workflows/adaptive_time_incrementor.h

@@ -14,12 +14,12 @@
 #pragma once
 
 #include "time_incrementor.h"
-
+#include "includes/kratos_export_api.h"
 
 namespace Kratos
 {
 
-class AdaptiveTimeIncrementor : public TimeIncrementor
+class KRATOS_API(GEO_MECHANICS_APPLICATION) AdaptiveTimeIncrementor : public TimeIncrementor
 {
 public:
     AdaptiveTimeIncrementor(double      StartTime,

applications/GeoMechanicsApplication/custom_workflows/custom_workflow_factory.h

@@ -12,11 +12,13 @@
 
 #pragma once
 
+#include "includes/kratos_export_api.h"
+
 namespace Kratos {
 
 class KratosGeoSettlement;
 
-class CustomWorkflowFactory{
+class KRATOS_API(GEO_MECHANICS_APPLICATION) CustomWorkflowFactory{
 public:
     static KratosGeoSettlement* CreateKratosGeoSettlement();
 };

applications/GeoMechanicsApplication/custom_workflows/geo_output_writer.h

@@ -22,7 +22,7 @@ namespace Kratos {
 class Model;
 class ModelPart;
 
-class GeoOutputWriter {
+class KRATOS_API(GEO_MECHANICS_APPLICATION) GeoOutputWriter {
 public:
     GeoOutputWriter(const Parameters& rGidOutputSettings,
                     const std::string& rWorkingDirectory,

applications/GeoMechanicsApplication/custom_workflows/prescribed_time_incrementor.h

@@ -16,12 +16,12 @@
 #include "time_incrementor.h"
 
 #include <vector>
-
+#include "includes/kratos_export_api.h"
 
 namespace Kratos
 {
 
-class PrescribedTimeIncrementor : public TimeIncrementor
+class KRATOS_API(GEO_MECHANICS_APPLICATION) PrescribedTimeIncrementor : public TimeIncrementor
 {
 public:
     explicit PrescribedTimeIncrementor(const std::vector<double>& increments);

applications/GeoMechanicsApplication/custom_workflows/time_step_executor.h

@@ -23,7 +23,7 @@
 namespace Kratos
 {
 
-class TimeStepExecutor
+class KRATOS_API(GEO_MECHANICS_APPLICATION) TimeStepExecutor
 {
 public:
     using ProcessRef    = std::reference_wrapper<Process>;

applications/LinearSolversApplication/CMakeLists.txt

@@ -146,8 +146,8 @@ if(${INSTALL_TESTING_FILES} MATCHES ON )
 endif(${INSTALL_TESTING_FILES} MATCHES ON)
 
 # Install targets
-install( TARGETS KratosLinearSolversCore DESTINATION libs )
-install( TARGETS KratosLinearSolversApplication DESTINATION libs )
+install( TARGETS KratosLinearSolversCore DESTINATION lib )
+install( TARGETS KratosLinearSolversApplication DESTINATION lib )
 
 # Define custom targets
 set(KRATOS_KERNEL "${KRATOS_KERNEL};KratosLinearSolversCore" PARENT_SCOPE)

applications/MappingApplication/tests/cpp_tests/test_mapper_utilities.cpp

@@ -15,7 +15,7 @@
 #include "testing/testing.h"
 #include "includes/model_part.h"
 #include "includes/stream_serializer.h"
-#include "utilities/cpp_tests_utilities.h"
+#include "tests/test_utilities/cpp_tests_utilities.h"
 #include "utilities/variable_utils.h"
 #include "geometries/quadrilateral_2d_4.h"
 #include "processes/structured_mesh_generator_process.h"

applications/MeshingApplication/tests/cpp_tests/mmg/test_internal_interpolation_process.cpp

@@ -24,7 +24,7 @@
 /* Processes */
 #include "processes/find_nodal_h_process.h"
 #include "custom_processes/mmg/mmg_process.h"
-#include "utilities/cpp_tests_utilities.h"
+#include "tests/test_utilities/cpp_tests_utilities.h"
 #include "includes/mat_variables.h"
 
 namespace Kratos

applications/MeshingApplication/tests/cpp_tests/mmg/test_mmg_io.cpp

@@ -22,7 +22,7 @@
 #include "includes/kratos_filesystem.h"
 #include "includes/kratos_flags.h"
 #include "containers/model.h"
-#include "utilities/cpp_tests_utilities.h"
+#include "tests/test_utilities/cpp_tests_utilities.h"
 #include "meshing_application_variables.h"
 #include "custom_io/mmg/mmg_io.h"
 

applications/MeshingApplication/tests/cpp_tests/mmg/test_mmg_process.cpp

@@ -20,7 +20,7 @@
 // #include "includes/gid_io.h"
 #include "containers/model.h"
 #include "meshing_application_variables.h"
-#include "utilities/cpp_tests_utilities.h"
+#include "tests/test_utilities/cpp_tests_utilities.h"
 
 /* Processes */
 #include "custom_processes/mmg/mmg_process.h"

applications/MeshingApplication/tests/cpp_tests/test_meshing_utilities.cpp

@@ -16,7 +16,7 @@
 // Project includes
 #include "testing/testing.h"
 #include "containers/model.h"
-#include "utilities/cpp_tests_utilities.h"
+#include "tests/test_utilities/cpp_tests_utilities.h"
 #include "custom_utilities/meshing_utilities.h"
 
 namespace Kratos {

applications/MeshingApplication/tests/cpp_tests/test_metric_process.cpp

@@ -20,7 +20,7 @@
 // #include "includes/gid_io.h"
 #include "containers/model.h"
 #include "meshing_application_variables.h"
-#include "utilities/cpp_tests_utilities.h"
+#include "tests/test_utilities/cpp_tests_utilities.h"
 
 /* Processes */
 #include "processes/compute_nodal_gradient_process.h"

applications/StructuralMechanicsApplication/CMakeLists.txt

@@ -1,10 +1,5 @@
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
-message("**** configuring KratosStructuralMechanicsApplication ****")
-
-################### PYBIND11
-include(pybind11Tools)
-
 include_directories( ${KRATOS_SOURCE_DIR}/kratos )
 
 ## StructuralMechanics Core sources
@@ -27,15 +22,24 @@ file(GLOB_RECURSE KRATOS_STRUCTURAL_MECHANICS_APPLICATION_PYTHON_INTERFACE ${CMA
 list(REMOVE_ITEM KRATOS_STRUCTURAL_MECHANICS_APPLICATION_CORE ${CMAKE_CURRENT_SOURCE_DIR}/custom_utilities/constitutive_law_utilities.cpp)
 list(INSERT KRATOS_STRUCTURAL_MECHANICS_APPLICATION_CORE 0 ${CMAKE_CURRENT_SOURCE_DIR}/custom_utilities/constitutive_law_utilities.cpp)
 
-# StructuralMechanics testing sources
-if(${KRATOS_BUILD_TESTING} MATCHES ON)
-    file(GLOB_RECURSE KRATOS_STRUCTURAL_MECHANICS_APPLICATION_TESTING_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/tests/cpp_tests/*.cpp)
-endif(${KRATOS_BUILD_TESTING} MATCHES ON)
-
-add_library(KratosStructuralMechanicsCore SHARED ${KRATOS_STRUCTURAL_MECHANICS_APPLICATION_CORE} ${KRATOS_STRUCTURAL_MECHANICS_APPLICATION_TESTING_SOURCES})
+add_library(KratosStructuralMechanicsCore SHARED ${KRATOS_STRUCTURAL_MECHANICS_APPLICATION_CORE})
 target_link_libraries(KratosStructuralMechanicsCore PUBLIC KratosCore)
 set_target_properties(KratosStructuralMechanicsCore PROPERTIES COMPILE_DEFINITIONS "STRUCTURAL_MECHANICS_APPLICATION=EXPORT,API")
 
+if (${KRATOS_BUILD_TESTING} MATCHES ON)
+    file(GLOB_RECURSE KRATOS_STRUCTURAL_MECHANICS_APPLICATION_TESTING_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/tests/cpp_tests/*.cpp)
+
+    add_executable(KratosStructuralMechanicsTest ${KRATOS_STRUCTURAL_MECHANICS_APPLICATION_TESTING_SOURCES})
+
+    target_link_libraries(KratosStructuralMechanicsTest PUBLIC KratosStructuralMechanicsCore KratosCoreTestUtilities GTest::gtest_main)
+
+    install(TARGETS KratosStructuralMechanicsTest)
+
+    include(GoogleTest)
+#    gtest_discover_tests(KratosStructuralMechanicsTest)
+
+endif (${KRATOS_BUILD_TESTING} MATCHES ON)
+
 # Define library Kratos which defines the basic python interface
 pybind11_add_module(KratosStructuralMechanicsApplication MODULE THIN_LTO ${KRATOS_STRUCTURAL_MECHANICS_APPLICATION_PYTHON_INTERFACE})
 target_link_libraries(KratosStructuralMechanicsApplication PUBLIC KratosStructuralMechanicsCore)
@@ -75,8 +79,8 @@ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/tests DESTINATION applications/${C
 )
 
 # Install targets
-install(TARGETS KratosStructuralMechanicsCore DESTINATION libs )
-install(TARGETS KratosStructuralMechanicsApplication DESTINATION libs )
+install(TARGETS KratosStructuralMechanicsCore DESTINATION lib)
+install(TARGETS KratosStructuralMechanicsApplication DESTINATION lib)
 
 # Define custom targets
 set(KRATOS_KERNEL "${KRATOS_KERNEL};KratosStructuralMechanicsCore" PARENT_SCOPE)