From ae44d234d50df748c5da9e3a1c5df9cce696c867 Mon Sep 17 00:00:00 2001 From: kai Date: Tue, 1 Apr 2025 16:24:09 +0200 Subject: [PATCH] fix cmake --- lab02/fib/CMakeLists.txt | 13 ++++++++++++- lab02/fib/src/main.cpp | 20 ++++++++++---------- 2 files changed, 22 insertions(+), 11 deletions(-) diff --git a/lab02/fib/CMakeLists.txt b/lab02/fib/CMakeLists.txt index 14f4b55..4caf321 100644 --- a/lab02/fib/CMakeLists.txt +++ b/lab02/fib/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.31) cmake_policy(SET CMP0135 NEW) # Projektname @@ -7,6 +7,8 @@ project(fib) # C++-Standard setzen set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED True) + + include(FetchContent) FetchContent_Declare( googletest @@ -33,5 +35,14 @@ target_link_libraries( ) include(GoogleTest) + +set(CMAKE_CXX_COMPILER /usr/bin/gcc) +set(CMAKE_CXX_FLAGS "-O3") +set(CMAKE_EXE_LINKER_FLAGS "-lstdc++") + +target_link_libraries(MyProject m) +target_link_libraries(test_stuff m) + + gtest_discover_tests(test_stuff) diff --git a/lab02/fib/src/main.cpp b/lab02/fib/src/main.cpp index a1f51b5..bb91f10 100644 --- a/lab02/fib/src/main.cpp +++ b/lab02/fib/src/main.cpp @@ -1,8 +1,9 @@ -#include -#include "matrix.h" #include "compute.cpp" +#include "compute2.cpp" #include "computeNew.cpp" +#include "matrix.h" #include +#include void print(Matrix &m) { std::cout << std::endl; @@ -17,11 +18,11 @@ void print(Matrix &m) { } Matrix create_matrix(int x, int n) { - Matrix m = Matrix(3, 3); + Matrix m = Matrix(n, n); - for (int i = 0; i < 3; i++) { - for (int y = 0; y < 3; y++) { - m(i, y) = 1; + for (int i = 0; i < n; i++) { + for (int y = 0; y < n; y++) { + m(i, y) = x; } } @@ -38,7 +39,7 @@ std::vector create_vector(int x, int n) { int main() { - std::vector v = create_vector(1, 3); + std::vector v = create_vector(1, 1000); Matrix m = create_matrix(1, 1000); std::chrono::duration sumTimeOld; @@ -53,9 +54,8 @@ int main() { auto endTimeNew = std::chrono::system_clock::now(); sumTimeNew = endTimeNew - startTimeNew; - std::cout << "Time old: " << sumTimeOld.count() << "\nTime new: " << sumTimeNew.count() << std::endl; - + std::cout << "Time old: " << sumTimeOld.count() + << "\nTime new: " << sumTimeNew.count() << std::endl; return 0; } -