From b489d1ae84d7ba5e060cd19fdd988e87d9adf8d9 Mon Sep 17 00:00:00 2001 From: NN708 Date: Wed, 13 Nov 2024 00:09:57 +0800 Subject: [PATCH 1/2] Fix build for contrib directory --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index eb554291d..e69f9ff9b 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -67,6 +67,7 @@ add_subdirectory( library ) add_subdirectory( qucs-transcalc ) add_subdirectory( qucs-powercombining ) add_subdirectory( qucs-s-spar-viewer ) +add_subdirectory( contrib ) #add_subdirectory( examples ) if(EXISTS ${CMAKE_SOURCE_DIR}/qucsator_rf/CMakeLists.txt) add_subdirectory(qucsator_rf) From c85cb4ea731ce09385c882282249cf3176db407c Mon Sep 17 00:00:00 2001 From: NN708 Date: Wed, 13 Nov 2024 00:29:10 +0800 Subject: [PATCH 2/2] Move install of MetaInfo to top level --- CMakeLists.txt | 3 ++- contrib/CMakeLists.txt | 2 -- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e69f9ff9b..5e75f85fe 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -67,7 +67,6 @@ add_subdirectory( library ) add_subdirectory( qucs-transcalc ) add_subdirectory( qucs-powercombining ) add_subdirectory( qucs-s-spar-viewer ) -add_subdirectory( contrib ) #add_subdirectory( examples ) if(EXISTS ${CMAKE_SOURCE_DIR}/qucsator_rf/CMakeLists.txt) add_subdirectory(qucsator_rf) @@ -82,6 +81,8 @@ add_subdirectory( translations ) install(DIRECTORY "examples" DESTINATION "share/${QUCS_NAME}") +install(FILES contrib/io.github.ra3xdh.qucs_s.metainfo.xml DESTINATION ${CMAKE_INSTALL_PREFIX}/share/metainfo) + # # Custom uninstall target # diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt index 66f716c70..9b9d417ef 100644 --- a/contrib/CMakeLists.txt +++ b/contrib/CMakeLists.txt @@ -3,5 +3,3 @@ INSTALL( FILES ps2sp DESTINATION bin/ ) INSTALL( FILES ps2sp.1 DESTINATION share/man/man1 ) - -INSTALL( FILES io.github.ra3xdh.qucs_s.metainfo.xml DESTINATION ${CMAKE_INSTALL_PREFIX}/share/metainfo )