From b458b2b35857a9aa35b68649bd95d54316190e75 Mon Sep 17 00:00:00 2001 From: Maurice <zimmnau@ilr.rwth-aachen.de> Date: Tue, 18 Feb 2025 12:25:13 +0100 Subject: [PATCH] Updated copy assignment for std libraries for unix systems --- aerodynamic_analysis/CMakeLists.txt | 5 ++++- empennage_design/CMakeLists.txt | 4 +++- systems_design/CMakeLists.txt | 4 +++- wing_design/CMakeLists.txt | 6 ++++-- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/aerodynamic_analysis/CMakeLists.txt b/aerodynamic_analysis/CMakeLists.txt index 40e6de23..e9c083d3 100644 --- a/aerodynamic_analysis/CMakeLists.txt +++ b/aerodynamic_analysis/CMakeLists.txt @@ -71,11 +71,14 @@ add_subdirectory(LiftingLine) # Add the installation rules install(TARGETS ${MODULE_NAME} DESTINATION ${MODULE_NAME}) -install(FILES +if(WIN32) + install(FILES ${MODULE_NAME}_conf.xml gmp-10.dll mpfr-6.dll DESTINATION ${MODULE_NAME}) +endif() + install( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/LiftingLine DESTINATION ${MODULE_NAME} diff --git a/empennage_design/CMakeLists.txt b/empennage_design/CMakeLists.txt index 6329e329..42c86bcb 100644 --- a/empennage_design/CMakeLists.txt +++ b/empennage_design/CMakeLists.txt @@ -91,11 +91,13 @@ endif() # Add the installation rules install (TARGETS ${MODULE_NAME} DESTINATION ${MODULE_NAME}) -install (FILES +if(WIN32) + install(FILES ${MODULE_NAME}_conf.xml gmp-10.dll mpfr-6.dll DESTINATION ${MODULE_NAME}) +endif() # Find and include all dependet libraries if dynamically linked if(BUILD_SHARED_LIBS) diff --git a/systems_design/CMakeLists.txt b/systems_design/CMakeLists.txt index 9f1ae408..5dbef858 100644 --- a/systems_design/CMakeLists.txt +++ b/systems_design/CMakeLists.txt @@ -85,11 +85,13 @@ endif() # Add the installation rules install(TARGETS ${MODULE_NAME} DESTINATION ${MODULE_NAME}) -install(FILES +if(WIN32) + install(FILES ${MODULE_NAME}_conf.xml gmp-10.dll mpfr-6.dll DESTINATION ${MODULE_NAME}) +endif() # Find and include all dependet libraries if dynamically linked if(BUILD_SHARED_LIBS) diff --git a/wing_design/CMakeLists.txt b/wing_design/CMakeLists.txt index cba6e661..318f8530 100644 --- a/wing_design/CMakeLists.txt +++ b/wing_design/CMakeLists.txt @@ -88,11 +88,13 @@ endif() # Add the installation rules install (TARGETS ${MODULE_NAME} DESTINATION ${MODULE_NAME}) -install (FILES - ${MODULE_NAME}_conf.xml +if(WIN32) + install(FILES + ${MODULE_NAME}_conf.xml gmp-10.dll mpfr-6.dll DESTINATION ${MODULE_NAME}) +endif() # Find and include all dependet libraries if dynamically linked if(BUILD_SHARED_LIBS) -- GitLab