From 26593e1e2de6b6b995caeaca451c8fa35a057ea2 Mon Sep 17 00:00:00 2001 From: Carl Philipp Klemm <philipp@uvos.xyz> Date: Mon, 6 Nov 2023 11:17:09 +0100 Subject: [PATCH] move componants into a subdirectory --- CMakeLists.txt | 16 ++++++++-------- cap.cpp => componant/cap.cpp | 0 componant.cpp => componant/componant.cpp | 0 constantphase.cpp => componant/constantphase.cpp | 0 inductor.cpp => componant/inductor.cpp | 0 .../paralellseriel.cpp | 0 resistor.cpp => componant/resistor.cpp | 0 warburg.cpp => componant/warburg.cpp | 0 8 files changed, 8 insertions(+), 8 deletions(-) rename cap.cpp => componant/cap.cpp (100%) rename componant.cpp => componant/componant.cpp (100%) rename constantphase.cpp => componant/constantphase.cpp (100%) rename inductor.cpp => componant/inductor.cpp (100%) rename paralellseriel.cpp => componant/paralellseriel.cpp (100%) rename resistor.cpp => componant/resistor.cpp (100%) rename warburg.cpp => componant/warburg.cpp (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 31dd253..15b37f4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,14 +7,14 @@ set (CMAKE_CXX_STANDARD 20) option(PROFILE_ENABLED "instrument for gprof" OFF) set(SRC_FILES - componant.cpp - cap.cpp - inductor.cpp - resistor.cpp - constantphase.cpp - warburg.cpp + componant/componant.cpp + componant/cap.cpp + componant/inductor.cpp + componant/resistor.cpp + componant/constantphase.cpp + componant/warburg.cpp + componant/paralellseriel.cpp model.cpp - paralellseriel.cpp log.cpp normalize.cpp basicmath.cpp @@ -88,7 +88,7 @@ endif(PROFILE_ENABLED) add_library(${PROJECT_NAME}_obj OBJECT ${SRC_FILES} ${API_HEADERS_CPP}) target_link_libraries(${PROJECT_NAME}_obj ${LIBS}) -target_include_directories(${PROJECT_NAME}_obj PUBLIC eisgenerator) +target_include_directories(${PROJECT_NAME}_obj PUBLIC eisgenerator .) set_target_properties(${PROJECT_NAME}_obj PROPERTIES POSITION_INDEPENDENT_CODE 1) set_target_properties(${PROJECT_NAME}_obj PROPERTIES COMPILE_FLAGS ${COMMON_COMPILE_FLAGS} LINK_FLAGS ${COMMON_LINK_FLAGS}) add_library(${PROJECT_NAME} SHARED $<TARGET_OBJECTS:${PROJECT_NAME}_obj>) diff --git a/cap.cpp b/componant/cap.cpp similarity index 100% rename from cap.cpp rename to componant/cap.cpp diff --git a/componant.cpp b/componant/componant.cpp similarity index 100% rename from componant.cpp rename to componant/componant.cpp diff --git a/constantphase.cpp b/componant/constantphase.cpp similarity index 100% rename from constantphase.cpp rename to componant/constantphase.cpp diff --git a/inductor.cpp b/componant/inductor.cpp similarity index 100% rename from inductor.cpp rename to componant/inductor.cpp diff --git a/paralellseriel.cpp b/componant/paralellseriel.cpp similarity index 100% rename from paralellseriel.cpp rename to componant/paralellseriel.cpp diff --git a/resistor.cpp b/componant/resistor.cpp similarity index 100% rename from resistor.cpp rename to componant/resistor.cpp diff --git a/warburg.cpp b/componant/warburg.cpp similarity index 100% rename from warburg.cpp rename to componant/warburg.cpp -- GitLab