From bb694b9b13252927611f7a3bb40faf9c71b7f896 Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Sat, 17 Jun 2023 20:53:08 -0500 Subject: [PATCH] [nostalgia] CMake cleanup --- src/nostalgia/modules/core/src/keel/CMakeLists.txt | 5 ----- src/nostalgia/modules/core/src/studio/CMakeLists.txt | 2 -- src/nostalgia/modules/scene/src/keel/CMakeLists.txt | 11 ++++++----- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/src/nostalgia/modules/core/src/keel/CMakeLists.txt b/src/nostalgia/modules/core/src/keel/CMakeLists.txt index 54800fd8..5a0d66ce 100644 --- a/src/nostalgia/modules/core/src/keel/CMakeLists.txt +++ b/src/nostalgia/modules/core/src/keel/CMakeLists.txt @@ -4,11 +4,6 @@ add_library( typeconv.cpp ) -target_include_directories( - NostalgiaCore-Keel PUBLIC - ../include -) - target_link_libraries( NostalgiaCore-Keel PUBLIC Keel diff --git a/src/nostalgia/modules/core/src/studio/CMakeLists.txt b/src/nostalgia/modules/core/src/studio/CMakeLists.txt index e620b732..988069cd 100644 --- a/src/nostalgia/modules/core/src/studio/CMakeLists.txt +++ b/src/nostalgia/modules/core/src/studio/CMakeLists.txt @@ -27,8 +27,6 @@ target_link_libraries( lodepng ) -#target_compile_definitions(NostalgiaCore-Studio PRIVATE QT_QML_DEBUG) - install( TARGETS NostalgiaCore-Studio-ImGui diff --git a/src/nostalgia/modules/scene/src/keel/CMakeLists.txt b/src/nostalgia/modules/scene/src/keel/CMakeLists.txt index af64e7ef..463ce4fb 100644 --- a/src/nostalgia/modules/scene/src/keel/CMakeLists.txt +++ b/src/nostalgia/modules/scene/src/keel/CMakeLists.txt @@ -4,13 +4,14 @@ add_library( typeconv.cpp ) -target_include_directories( - NostalgiaScene-Keel PUBLIC - ../include -) - target_link_libraries( NostalgiaScene-Keel PUBLIC Keel NostalgiaScene ) +install( + TARGETS + NostalgiaScene-Keel + LIBRARY DESTINATION + ${NOSTALGIA_DIST_MODULE} +)