From 43e8b3a73a1ab5022477d489ebf10f3b05cf4bbc Mon Sep 17 00:00:00 2001 From: Vegard Gjeldvik Jervell Date: Thu, 16 Jan 2025 09:13:08 +0100 Subject: [PATCH] Remove deleted include dir from CMakeLists (stop flooding output with missing-include-dir warnings) --- CMakeLists.txt | 23 +++++++++++++++++++++++ src/CMakeLists.txt | 4 ---- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b21de9e3..1edd99b6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,3 +1,26 @@ +# CMake build system for ThermoPack +# +# To run (from the directory in which this file is found) +# mkdir build +# cd build +# cmake .. +# make install +# +# Installs files ("." refers to the directory in which this file is found) +# ./installed/libthermopack.{dynamic library} +# ./installed/libthermopack.{static library} +# ./addon/pycThermopack/thermopack/libthermopack.{dynamic library} +# ./installed/run_thermopack +# +# (optional) ./installed/unittests +# +# Accepts options +# test : Build unittests suite +# cmake -Dtest=ON .. # CMakeCache.txt must be cleared to switch ON/OFF +# make install +# ../installed/unittests +# + cmake_minimum_required(VERSION 3.19) project(ThermoPack LANGUAGES Fortran) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 03448fe4..2e786f86 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -4,8 +4,6 @@ set(CMAKE_Fortran_FLAGS_DEBUG "${CMAKE_Fortran_FLAGS_DEBUG} ${tp_debug_flags}") file(GLOB SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.f90) list(REMOVE_ITEM SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/thermopack.f90) -set(TREND_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../addon/trend_interface/include) -set(TREND ${TREND_DIR}/trend_interface.f95) if(NOT MSVC) find_package(LAPACK REQUIRED) @@ -24,14 +22,12 @@ else() endif() add_library(thermopack_obj OBJECT ${SOURCES}) -target_include_directories(thermopack_obj PUBLIC ${TREND_DIR}) if(MSVC) set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>") add_library(thermopack SHARED ${SOURCES}) set_target_properties(thermopack PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/dynamic OUTPUT_NAME libthermopack) set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /DEF:${CMAKE_SOURCE_DIR}/MSVStudio/thermopack.def") target_link_options(thermopack PRIVATE "/NODEFAULTLIB:libmmd" "/NODEFAULTLIB:MSVCRT" "/NODEFAULTLIB:libifcoremd" "/NODEFAULTLIB:svml_dispmd") - target_include_directories(thermopack PRIVATE ${TREND_DIR}) else(MSVC) if(APPLE) set(tp_linker_flags "-exported_symbols_list ${CMAKE_CURRENT_SOURCE_DIR}/../libthermopack_export.symbols")