diff --git a/build/CMakeCache.txt b/build/CMakeCache.txt index 0ccf29b..7364490 100644 --- a/build/CMakeCache.txt +++ b/build/CMakeCache.txt @@ -276,6 +276,15 @@ FETCHCONTENT_QUIET:BOOL=ON //Enables UPDATE_DISCONNECTED behavior for all content population FETCHCONTENT_UPDATES_DISCONNECTED:BOOL=OFF +//Value Computed by CMake +IGATRIMGAUSSBIN_BINARY_DIR:STATIC=/Users/forty-twoo/Workspace/IGATrimGauss/build/src + +//Value Computed by CMake +IGATRIMGAUSSBIN_IS_TOP_LEVEL:STATIC=OFF + +//Value Computed by CMake +IGATRIMGAUSSBIN_SOURCE_DIR:STATIC=/Users/forty-twoo/Workspace/IGATrimGauss/src + //Value Computed by CMake IGATrimGauss_BINARY_DIR:STATIC=/Users/forty-twoo/Workspace/IGATrimGauss/build @@ -464,7 +473,7 @@ CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_NM CMAKE_NM-ADVANCED:INTERNAL=1 //number of local generators -CMAKE_NUMBER_OF_MAKEFILES:INTERNAL=5 +CMAKE_NUMBER_OF_MAKEFILES:INTERNAL=4 //ADVANCED property for variable: CMAKE_OBJCOPY CMAKE_OBJCOPY-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_OBJDUMP diff --git a/include/Config.h b/include/Config.h new file mode 100644 index 0000000..ffccc2e --- /dev/null +++ b/include/Config.h @@ -0,0 +1,16 @@ +#pragma once +#include +#include + +namespace SIM +{ + class Config + { + public: + std::string filePath; + + public: + bool loadFromJSON(const std::string &p_filePath); + }; + +} \ No newline at end of file diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index e1580ab..0678cfb 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,5 +1,9 @@ set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_FLAGS "-std=c++11 ${CMAKE_CXX_FLAGS}") +project(IGATRIMGAUSS_BIN) -add_subdirectory(trimmedsurface) -add_subdirectory(LinSysSolver) \ No newline at end of file +add_subdirectory(LinSysSolver) + +file(GLOB SRCFILES ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp) +add_executable(${PROJECT_NAME} ${SRCFILES}) +target_link_libraries(${PROJECT_NAME} PUBLIC LinSysSolver) \ No newline at end of file diff --git a/src/Config.cpp b/src/Config.cpp new file mode 100644 index 0000000..921f94d --- /dev/null +++ b/src/Config.cpp @@ -0,0 +1,5 @@ +#include +#include +#include +#include +#include "Config.h" diff --git a/src/trimmedsurface/main.cpp b/src/main.cpp similarity index 100% rename from src/trimmedsurface/main.cpp rename to src/main.cpp diff --git a/src/trimmedsurface/CMakeLists.txt b/src/trimmedsurface/CMakeLists.txt deleted file mode 100644 index 3817f6a..0000000 --- a/src/trimmedsurface/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ -project(trimmedsurf) - -add_executable(${PROJECT_NAME} main.cpp) -target_link_libraries(${PROJECT_NAME} PUBLIC LinSysSolver)