From 546ebfd0bd469b5ac11ea6112ec90a9885abd8af Mon Sep 17 00:00:00 2001 From: Joshua Goins Date: Sun, 10 Dec 2023 06:51:33 -0500 Subject: [PATCH] Reformat CMake code a bit --- CMakeLists.txt | 6 +++--- argcracker/CMakeLists.txt | 13 +++++++------ armoury/CMakeLists.txt | 4 ++-- common/CMakeLists.txt | 7 +++++-- karuku/CMakeLists.txt | 6 ++++-- launcher/CMakeLists.txt | 5 ++++- mdlviewer/CMakeLists.txt | 5 ++++- parts/cmp/CMakeLists.txt | 4 +--- parts/mdl/CMakeLists.txt | 9 +++++---- parts/shpk/CMakeLists.txt | 3 ++- parts/sklb/CMakeLists.txt | 3 ++- parts/tex/CMakeLists.txt | 3 ++- renderer/CMakeLists.txt | 10 +++++++--- sagasu/CMakeLists.txt | 9 +++++---- 14 files changed, 53 insertions(+), 34 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 44d1a30..185c2a3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,8 +27,8 @@ include(FeatureSummary) include(FetchContent) ecm_setup_version(${PROJECT_VERSION} - VARIABLE_PREFIX NOVUS - VERSION_HEADER ${CMAKE_CURRENT_BINARY_DIR}/novus-version.h + VARIABLE_PREFIX NOVUS + VERSION_HEADER ${CMAKE_CURRENT_BINARY_DIR}/novus-version.h ) find_package(Qt6 ${QT_MIN_VERSION} COMPONENTS Core Widgets Concurrent Core5Compat Sql HttpServer CONFIG REQUIRED) @@ -37,7 +37,7 @@ find_package(Vulkan REQUIRED) find_package(glm REQUIRED) if (NOT TARGET glm::glm) add_library(glm::glm ALIAS glm) -endif() +endif () add_subdirectory(extern) add_subdirectory(renderer) diff --git a/argcracker/CMakeLists.txt b/argcracker/CMakeLists.txt index 6f6bfc9..48b4630 100644 --- a/argcracker/CMakeLists.txt +++ b/argcracker/CMakeLists.txt @@ -2,9 +2,10 @@ # SPDX-License-Identifier: CC0-1.0 add_executable(novus-argcracker) -target_sources(novus-argcracker PRIVATE - src/main.cpp - src/tickcount.cpp) +target_sources(novus-argcracker + PRIVATE + src/main.cpp + src/tickcount.cpp) target_link_libraries(novus-argcracker PRIVATE Physis::Physis @@ -17,10 +18,10 @@ endif () if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows") target_compile_definitions(novus-argcracker PUBLIC WIN32) -endif() +endif () -if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") +if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux") target_compile_definitions(novus-argcracker PUBLIC LINUX) -endif() +endif () install(TARGETS novus-argcracker ${KF${QT_MAJOR_VERSION}_INSTALL_TARGETS_DEFAULT_ARGS}) \ No newline at end of file diff --git a/armoury/CMakeLists.txt b/armoury/CMakeLists.txt index bac7535..5ac97a4 100644 --- a/armoury/CMakeLists.txt +++ b/armoury/CMakeLists.txt @@ -2,7 +2,8 @@ # SPDX-License-Identifier: CC0-1.0 add_executable(novus-armoury) -target_sources(novus-armoury PRIVATE +target_sources(novus-armoury + PRIVATE include/boneeditor.h include/cmpeditor.h include/fullmodelviewer.h @@ -23,7 +24,6 @@ target_sources(novus-armoury PRIVATE src/mainwindow.cpp src/settingswindow.cpp src/singlegearview.cpp) - target_include_directories(novus-armoury PUBLIC include diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt index 1ff4564..d17fd72 100644 --- a/common/CMakeLists.txt +++ b/common/CMakeLists.txt @@ -2,20 +2,23 @@ # SPDX-License-Identifier: CC0-1.0 add_library(novus-common STATIC) -target_sources(novus-common PRIVATE +target_sources(novus-common + PRIVATE include/aboutdata.h include/filecache.h include/novusmainwindow.h include/quaternionedit.h include/settings.h include/vec3edit.h + src/aboutdata.cpp src/filecache.cpp src/novusmainwindow.cpp src/quaternionedit.cpp src/settings.cpp src/vec3edit.cpp) -target_include_directories(novus-common PUBLIC +target_include_directories(novus-common + PUBLIC include PRIVATE ${CMAKE_BINARY_DIR}) diff --git a/karuku/CMakeLists.txt b/karuku/CMakeLists.txt index 0435676..856eef8 100644 --- a/karuku/CMakeLists.txt +++ b/karuku/CMakeLists.txt @@ -2,13 +2,15 @@ # SPDX-License-Identifier: CC0-1.0 add_executable(novus-karuku) -target_sources(novus-karuku PRIVATE +target_sources(novus-karuku + PRIVATE + include/mainwindow.h + src/main.cpp src/mainwindow.cpp) target_include_directories(novus-karuku PUBLIC include) - target_link_libraries(novus-karuku PRIVATE Novus::Common diff --git a/launcher/CMakeLists.txt b/launcher/CMakeLists.txt index c63d47e..4170fc6 100644 --- a/launcher/CMakeLists.txt +++ b/launcher/CMakeLists.txt @@ -2,7 +2,10 @@ # SPDX-License-Identifier: CC0-1.0 add_executable(novus-launcher) -target_sources(novus-launcher PRIVATE +target_sources(novus-launcher + PRIVATE + include/mainwindow.h + src/main.cpp src/mainwindow.cpp) target_link_libraries(novus-launcher diff --git a/mdlviewer/CMakeLists.txt b/mdlviewer/CMakeLists.txt index bf50de0..b7cace9 100644 --- a/mdlviewer/CMakeLists.txt +++ b/mdlviewer/CMakeLists.txt @@ -2,7 +2,10 @@ # SPDX-License-Identifier: CC0-1.0 add_executable(novus-mdlviewer) -target_sources(novus-mdlviewer PRIVATE +target_sources(novus-mdlviewer + PRIVATE + include/mainwindow.h + src/main.cpp src/mainwindow.cpp) target_include_directories(novus-mdlviewer diff --git a/parts/cmp/CMakeLists.txt b/parts/cmp/CMakeLists.txt index 58ce919..d080d15 100644 --- a/parts/cmp/CMakeLists.txt +++ b/parts/cmp/CMakeLists.txt @@ -2,9 +2,7 @@ # SPDX-License-Identifier: CC0-1.0 add_library(cmppart STATIC) -target_sources(cmppart PRIVATE - cmppart.cpp - cmppart.h) +target_sources(cmppart PRIVATE cmppart.cpp cmppart.h) target_link_libraries(cmppart PUBLIC Physis::Physis diff --git a/parts/mdl/CMakeLists.txt b/parts/mdl/CMakeLists.txt index 02faa9d..9b170a1 100644 --- a/parts/mdl/CMakeLists.txt +++ b/parts/mdl/CMakeLists.txt @@ -2,7 +2,8 @@ # SPDX-License-Identifier: CC0-1.0 add_library(mdlpart STATIC) -target_sources(mdlpart PRIVATE +target_sources(mdlpart + PRIVATE mdlexport.cpp mdlexport.h mdlimport.cpp @@ -10,9 +11,9 @@ target_sources(mdlpart PRIVATE mdlpart.cpp mdlpart.h vulkanwindow.cpp - vulkanwindow.h -) -target_link_libraries(mdlpart PUBLIC + vulkanwindow.h) +target_link_libraries(mdlpart + PUBLIC Novus::Renderer Novus::Common Physis::Physis diff --git a/parts/shpk/CMakeLists.txt b/parts/shpk/CMakeLists.txt index 47a6e22..16be22c 100644 --- a/parts/shpk/CMakeLists.txt +++ b/parts/shpk/CMakeLists.txt @@ -7,7 +7,8 @@ find_package(SPIRV-Headers REQUIRED) add_library(shpkpart STATIC) target_sources(shpkpart PRIVATE shpkpart.cpp) -target_link_libraries(shpkpart PUBLIC +target_link_libraries(shpkpart + PUBLIC Novus::Common Physis::Physis dxbc diff --git a/parts/sklb/CMakeLists.txt b/parts/sklb/CMakeLists.txt index d5a2e22..c5931c3 100644 --- a/parts/sklb/CMakeLists.txt +++ b/parts/sklb/CMakeLists.txt @@ -2,7 +2,8 @@ # SPDX-License-Identifier: CC0-1.0 add_library(sklbpart STATIC) -target_sources(sklbpart PRIVATE +target_sources(sklbpart + PRIVATE sklbpart.cpp sklbpart.h) target_link_libraries(sklbpart diff --git a/parts/tex/CMakeLists.txt b/parts/tex/CMakeLists.txt index cef2a3e..a5101e3 100644 --- a/parts/tex/CMakeLists.txt +++ b/parts/tex/CMakeLists.txt @@ -2,7 +2,8 @@ # SPDX-License-Identifier: CC0-1.0 add_library(texpart STATIC) -target_sources(texpart PRIVATE +target_sources(texpart + PRIVATE imagelabel.cpp imagelabel.h texpart.cpp diff --git a/renderer/CMakeLists.txt b/renderer/CMakeLists.txt index c4cdec5..a5273b1 100644 --- a/renderer/CMakeLists.txt +++ b/renderer/CMakeLists.txt @@ -2,12 +2,15 @@ # SPDX-License-Identifier: CC0-1.0 add_library(renderer STATIC) -target_sources(renderer PRIVATE +target_sources(renderer + PRIVATE include/renderer.hpp + src/renderer.cpp src/imguipass.cpp src/imguipass.h) -qt_add_resources(renderer "shaders" +qt_add_resources(renderer + "shaders" PREFIX "/" FILES shaders/imgui.frag.spv @@ -15,7 +18,8 @@ qt_add_resources(renderer "shaders" shaders/mesh.frag.spv shaders/mesh.vert.spv) target_include_directories(renderer PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include) -target_link_libraries(renderer PUBLIC +target_link_libraries(renderer + PUBLIC Qt6::Core Vulkan::Vulkan Physis::Physis diff --git a/sagasu/CMakeLists.txt b/sagasu/CMakeLists.txt index a0f69f1..012f3e3 100644 --- a/sagasu/CMakeLists.txt +++ b/sagasu/CMakeLists.txt @@ -2,7 +2,8 @@ # SPDX-License-Identifier: CC0-1.0 add_library(novus-sagasu-static STATIC) -target_sources(novus-sagasu-static PRIVATE +target_sources(novus-sagasu-static + PRIVATE include/hashdatabase.h src/hashdatabase.cpp) target_link_libraries(novus-sagasu-static @@ -14,8 +15,7 @@ target_link_libraries(novus-sagasu-static target_include_directories(novus-sagasu-static PRIVATE include) add_executable(novus-sagasu-indexer) -target_sources(novus-sagasu-indexer PRIVATE - src/indexer.cpp) +target_sources(novus-sagasu-indexer PRIVATE src/indexer.cpp) target_link_libraries(novus-sagasu-indexer PRIVATE novus-sagasu-static @@ -23,7 +23,8 @@ target_link_libraries(novus-sagasu-indexer target_include_directories(novus-sagasu-indexer PRIVATE include) add_executable(novus-sagasu) -target_sources(novus-sagasu PRIVATE +target_sources(novus-sagasu + PRIVATE src/main.cpp src/mainwindow.cpp src/filetreewindow.cpp