fix cmake

This commit is contained in:
kai
2025-04-01 16:24:09 +02:00
parent 014e57db3e
commit ae44d234d5
2 changed files with 22 additions and 11 deletions

View File

@@ -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)

View File

@@ -1,8 +1,9 @@
#include <iostream>
#include "matrix.h"
#include "compute.cpp"
#include "compute2.cpp"
#include "computeNew.cpp"
#include "matrix.h"
#include <chrono>
#include <iostream>
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<int> create_vector(int x, int n) {
int main() {
std::vector<int> v = create_vector(1, 3);
std::vector<int> v = create_vector(1, 1000);
Matrix m = create_matrix(1, 1000);
std::chrono::duration<double, std::milli> 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;
}