From f4262dc3e997d70fb0b7232da7652e3f8a3a28aa Mon Sep 17 00:00:00 2001 From: Joshua Goins Date: Tue, 10 Oct 2023 16:52:46 -0400 Subject: [PATCH] armoury: Fix up CMakeLists.txt, prefix executable with novus- --- armoury/CMakeLists.txt | 41 +++++++++++++++++++++++++---------------- 1 file changed, 25 insertions(+), 16 deletions(-) diff --git a/armoury/CMakeLists.txt b/armoury/CMakeLists.txt index 0af13f2..8f46096 100644 --- a/armoury/CMakeLists.txt +++ b/armoury/CMakeLists.txt @@ -1,26 +1,36 @@ # SPDX-FileCopyrightText: 2023 Joshua Goins # SPDX-License-Identifier: CC0-1.0 -add_executable(armoury - src/main.cpp - src/mainwindow.cpp - src/vec3edit.cpp +add_executable(novus-armoury) +target_sources(novus-armoury PRIVATE + include/boneeditor.h + include/cmpeditor.h + include/fullmodelviewer.h + include/gearlistmodel.h + include/gearlistwidget.h + include/gearview.h + include/mainwindow.h + include/quaternionedit.h + include/singlegearview.h include/vec3edit.h - src/gearview.cpp - src/singlegearview.cpp - src/fullmodelviewer.cpp - src/quaternionedit.cpp + src/boneeditor.cpp src/cmpeditor.cpp + src/fullmodelviewer.cpp + src/gearlistmodel.cpp src/gearlistwidget.cpp - src/gearlistmodel.cpp) -target_include_directories(armoury + src/gearview.cpp + src/main.cpp + src/mainwindow.cpp + src/quaternionedit.cpp + src/singlegearview.cpp + src/vec3edit.cpp) +target_include_directories(novus-armoury PUBLIC include PRIVATE ${CMAKE_BINARY_DIR}) -target_link_libraries(armoury PUBLIC - ${LIBRARIES} +target_link_libraries(novus-armoury PUBLIC Qt6::Core Qt6::Widgets Qt6::Concurrent @@ -32,8 +42,7 @@ target_link_libraries(armoury PUBLIC imgui NovusCommon) -install(TARGETS armoury - DESTINATION "${INSTALL_BIN_PATH}") +install(TARGETS novus-armoury ${KF${QT_MAJOR_VERSION}_INSTALL_TARGETS_DEFAULT_ARGS}) if(WIN32) get_target_property(QMAKE_EXE Qt5::qmake IMPORTED_LOCATION) @@ -43,8 +52,8 @@ if(WIN32) find_program(WINDEPLOYQT_EXECUTABLE windeployqt HINTS "${QT_BIN_DIR}") # Run windeployqt immediately after build - add_custom_command(TARGET armoury + add_custom_command(TARGET novus-armoury POST_BUILD - COMMAND "${WINDEPLOYQT_ENV_SETUP}" && "${WINDEPLOYQT_EXECUTABLE}" \"$\" + COMMAND "${WINDEPLOYQT_ENV_SETUP}" && "${WINDEPLOYQT_EXECUTABLE}" \"$\" ) endif() \ No newline at end of file