From 372f3866d06e1169646c70eb9beb015884138c20 Mon Sep 17 00:00:00 2001 From: Tyler McGurrin Date: Sun, 8 Jun 2025 10:22:39 -0400 Subject: [PATCH] groaaaaan --- CMakeLists.txt | 3 +++ Makefile | 38 -------------------------------------- libs/vector | 2 +- test.txt | 1 - 4 files changed, 4 insertions(+), 40 deletions(-) delete mode 100644 Makefile delete mode 100644 test.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index 65f1cf9..8316ed5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,6 +21,8 @@ set(MODULES src/tokenizer.f90 add_library(f90getopt SHARED libs/f90getopt/f90getopt.F90) +add_subdirectory(libs/vector ${CMAKE_CURRENT_BINARY_DIR}/vector) + add_library(${PROJECT_NAME}-lib SHARED ${MODULES}) add_executable(${PROJECT_NAME} src/main.f90) @@ -33,6 +35,7 @@ target_link_libraries( ${PROJECT_NAME} PUBLIC f90getopt + fortran-vector ${PROJECT_NAME}-lib PRIVATE fortran_stdlib::fortran_stdlib diff --git a/Makefile b/Makefile deleted file mode 100644 index 40d8c88..0000000 --- a/Makefile +++ /dev/null @@ -1,38 +0,0 @@ -FC=gfortran -FFLAGS=-std=f2023 -fdec-structure -BUILD_DIR=build -SRC_DIR=src -LIBS_DIR=libs -INCLUDE_DIR=/usr/include/fortran_stdlib/GNU-15.1.1/ -SYSLIB_DIR=/usr/lib/ - -STDLIB_CFLAGS := `pkg-config --cflags fortran_stdlib` -STDLIB_LIBS := `pkg-config --libs fortran_stdlib` - -SOURCES_FORTRAN = $(wildcard $(SRC_DIR)/*.f90) - -LIBS_FORTRAN = $(wildcard $(LIBS_DIR)/*.f90) \ - $(wildcard $(LIBS_DIR)/*/*.f90) \ - $(wildcard $(LIBS_DIR)/*/*/*.f90) \ - $(wildcard $(LIBS_DIR)/*/*/*/*.f90) \ - $(wildcard $(LIBS_DIR)/*.F90) \ - $(wildcard $(LIBS_DIR)/*/*.F90) \ - $(wildcard $(LIBS_DIR)/*/*/*.F90) \ - $(wildcard $(LIBS_DIR)/*/*/*/*.F90) \ - $(wildcard $(SRC_DIR)/modules/*.f90) \ - $(wildcard $(SRC_DIR)/modules/*.F90) - -.phony: all main clean always - -all: always main - -main: - $(FC) $(FFLAGS) $(STDLIB_CFLAGS) $(STDLIB_LIBS) $(LIBS_FORTRAN) $(SOURCES_FORTRAN) -o $(BUILD_DIR)/fcc - -always: - mkdir -p $(BUILD_DIR) - -clean: - rm -rf $(BUILD_DIR) - rm $(wildcard *.mod) - rm $(wildcard *.smod) \ No newline at end of file diff --git a/libs/vector b/libs/vector index 924a499..5fd37a9 160000 --- a/libs/vector +++ b/libs/vector @@ -1 +1 @@ -Subproject commit 924a499586edcf48f2178acdbd31b40d5f659b04 +Subproject commit 5fd37a9b3e4fc103cc7f40b4d629e2871dd64059 diff --git a/test.txt b/test.txt deleted file mode 100644 index b7543dd..0000000 --- a/test.txt +++ /dev/null @@ -1 +0,0 @@ -Hellorld!