From 84f0fef77a06a17555fbed647cb2e34c984e2de2 Mon Sep 17 00:00:00 2001 From: Emmanuel Branlard Date: Tue, 3 Oct 2023 19:28:10 -0600 Subject: [PATCH] UADvr: introducing basicaerolib in cmake for compilation of ua driver --- modules/aerodyn/CMakeLists.txt | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/modules/aerodyn/CMakeLists.txt b/modules/aerodyn/CMakeLists.txt index b70b821861..9197f57074 100644 --- a/modules/aerodyn/CMakeLists.txt +++ b/modules/aerodyn/CMakeLists.txt @@ -26,8 +26,20 @@ if (GENERATE_TYPES) generate_f90_types(src/FVW_Registry.txt ${CMAKE_CURRENT_LIST_DIR}/src/FVW_Types.f90) endif() +# BasicAero Library +add_library(basicaerolib + # UnsteadyAero lib + src/UnsteadyAero.f90 + src/UnsteadyAero_Types.f90 + + # AirFoil Info lib + src/AirfoilInfo.f90 + src/AirfoilInfo_Types.f90 +) +target_link_libraries(basicaerolib ifwlib nwtclibs) + # AeroDyn Library -add_library(aerodynlib +add_library(aerodynlib src/AeroDyn.f90 src/AeroDyn_IO_Params.f90 src/AeroDyn_IO.f90 @@ -46,14 +58,6 @@ add_library(aerodynlib src/AeroAcoustics_IO.f90 src/AeroAcoustics_Types.f90 - # UnsteadyAero lib - src/UnsteadyAero.f90 - src/UnsteadyAero_Types.f90 - - # AirFoil Info lib - src/AirfoilInfo.f90 - src/AirfoilInfo_Types.f90 - # FVW lib src/FVW.f90 src/FVW_IO.f90 @@ -68,7 +72,7 @@ add_library(aerodynlib src/AeroDyn_Inflow.f90 src/AeroDyn_Inflow_Types.f90 ) -target_link_libraries(aerodynlib ifwlib nwtclibs) +target_link_libraries(aerodynlib basicaerolib ifwlib nwtclibs) # AeroDyn Driver Subs Library add_library(aerodyn_driver_subs @@ -88,7 +92,7 @@ add_executable(unsteadyaero_driver src/UnsteadyAero_Driver.f90 src/UA_Dvr_Subs.f90 ) -target_link_libraries(unsteadyaero_driver aerodyn_driver_subs lindynlib) +target_link_libraries(unsteadyaero_driver basicaerolib lindynlib versioninfolib) # AeroDyn-InflowWind c-bindings interface library add_library(aerodyn_inflow_c_binding SHARED @@ -99,7 +103,7 @@ if(APPLE OR UNIX) target_compile_definitions(aerodyn_inflow_c_binding PRIVATE IMPLICIT_DLLEXPORT) endif() -install(TARGETS aerodynlib aerodyn_driver_subs aerodyn_driver unsteadyaero_driver aerodyn_inflow_c_binding +install(TARGETS aerodynlib basicaerolib aerodyn_driver_subs aerodyn_driver unsteadyaero_driver aerodyn_inflow_c_binding EXPORT "${CMAKE_PROJECT_NAME}Libraries" RUNTIME DESTINATION bin LIBRARY DESTINATION lib