redstrate/novus
1
Fork 0
mirror of https://github.com/redstrate/Novus.git synced 2025-04-26 05:37:46 +00:00
Code Activity

Reformat CMake code a bit

Browse source
This commit is contained in:
Joshua Goins 2023-12-10 06:51:33 -05:00
parent 81e9c09be8
commit 546ebfd0bd
14 changed files with 53 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -37,7 +37,7 @@ find_package(Vulkan REQUIRED)
find_package(glm REQUIRED) find_package(glm REQUIRED)
if (NOT TARGET glm::glm) if (NOT TARGET glm::glm)
add_library(glm::glm ALIAS glm) add_library(glm::glm ALIAS glm)
endif() endif ()
add_subdirectory(extern) add_subdirectory(extern)
add_subdirectory(renderer) add_subdirectory(renderer)

9
argcracker/CMakeLists.txt
View file

@ -2,7 +2,8 @@
# SPDX-License-Identifier: CC0-1.0 # SPDX-License-Identifier: CC0-1.0
add_executable(novus-argcracker) add_executable(novus-argcracker)
target_sources(novus-argcracker PRIVATE target_sources(novus-argcracker
PRIVATE
src/main.cpp src/main.cpp
src/tickcount.cpp) src/tickcount.cpp)
target_link_libraries(novus-argcracker target_link_libraries(novus-argcracker
@ -17,10 +18,10 @@ endif ()
if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows") if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
target_compile_definitions(novus-argcracker PUBLIC WIN32) 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) target_compile_definitions(novus-argcracker PUBLIC LINUX)
endif() endif ()
install(TARGETS novus-argcracker ${KF${QT_MAJOR_VERSION}_INSTALL_TARGETS_DEFAULT_ARGS}) install(TARGETS novus-argcracker ${KF${QT_MAJOR_VERSION}_INSTALL_TARGETS_DEFAULT_ARGS})

4
armoury/CMakeLists.txt
View file

@ -2,7 +2,8 @@
# SPDX-License-Identifier: CC0-1.0 # SPDX-License-Identifier: CC0-1.0
add_executable(novus-armoury) add_executable(novus-armoury)
target_sources(novus-armoury PRIVATE target_sources(novus-armoury
PRIVATE
include/boneeditor.h include/boneeditor.h
include/cmpeditor.h include/cmpeditor.h
include/fullmodelviewer.h include/fullmodelviewer.h
@ -23,7 +24,6 @@ target_sources(novus-armoury PRIVATE
src/mainwindow.cpp src/mainwindow.cpp
src/settingswindow.cpp src/settingswindow.cpp
src/singlegearview.cpp) src/singlegearview.cpp)
target_include_directories(novus-armoury target_include_directories(novus-armoury
PUBLIC PUBLIC
include include

7
common/CMakeLists.txt
View file

@ -2,20 +2,23 @@
# SPDX-License-Identifier: CC0-1.0 # SPDX-License-Identifier: CC0-1.0
add_library(novus-common STATIC) add_library(novus-common STATIC)
target_sources(novus-common PRIVATE target_sources(novus-common
PRIVATE
include/aboutdata.h include/aboutdata.h
include/filecache.h include/filecache.h
include/novusmainwindow.h include/novusmainwindow.h
include/quaternionedit.h include/quaternionedit.h
include/settings.h include/settings.h
include/vec3edit.h include/vec3edit.h
src/aboutdata.cpp src/aboutdata.cpp
src/filecache.cpp src/filecache.cpp
src/novusmainwindow.cpp src/novusmainwindow.cpp
src/quaternionedit.cpp src/quaternionedit.cpp
src/settings.cpp src/settings.cpp
src/vec3edit.cpp) src/vec3edit.cpp)
target_include_directories(novus-common PUBLIC target_include_directories(novus-common
PUBLIC
include include
PRIVATE PRIVATE
${CMAKE_BINARY_DIR}) ${CMAKE_BINARY_DIR})

6
karuku/CMakeLists.txt
View file

@ -2,13 +2,15 @@
# SPDX-License-Identifier: CC0-1.0 # SPDX-License-Identifier: CC0-1.0
add_executable(novus-karuku) add_executable(novus-karuku)
target_sources(novus-karuku PRIVATE target_sources(novus-karuku
PRIVATE
include/mainwindow.h
src/main.cpp src/main.cpp
src/mainwindow.cpp) src/mainwindow.cpp)
target_include_directories(novus-karuku target_include_directories(novus-karuku
PUBLIC PUBLIC
include) include)
target_link_libraries(novus-karuku target_link_libraries(novus-karuku
PRIVATE PRIVATE
Novus::Common Novus::Common

5
launcher/CMakeLists.txt
View file

@ -2,7 +2,10 @@
# SPDX-License-Identifier: CC0-1.0 # SPDX-License-Identifier: CC0-1.0
add_executable(novus-launcher) add_executable(novus-launcher)
target_sources(novus-launcher PRIVATE target_sources(novus-launcher
PRIVATE
include/mainwindow.h
src/main.cpp src/main.cpp
src/mainwindow.cpp) src/mainwindow.cpp)
target_link_libraries(novus-launcher target_link_libraries(novus-launcher

5
mdlviewer/CMakeLists.txt
View file

@ -2,7 +2,10 @@
# SPDX-License-Identifier: CC0-1.0 # SPDX-License-Identifier: CC0-1.0
add_executable(novus-mdlviewer) add_executable(novus-mdlviewer)
target_sources(novus-mdlviewer PRIVATE target_sources(novus-mdlviewer
PRIVATE
include/mainwindow.h
src/main.cpp src/main.cpp
src/mainwindow.cpp) src/mainwindow.cpp)
target_include_directories(novus-mdlviewer target_include_directories(novus-mdlviewer

4
parts/cmp/CMakeLists.txt
View file

@ -2,9 +2,7 @@
# SPDX-License-Identifier: CC0-1.0 # SPDX-License-Identifier: CC0-1.0
add_library(cmppart STATIC) add_library(cmppart STATIC)
target_sources(cmppart PRIVATE target_sources(cmppart PRIVATE cmppart.cpp cmppart.h)
cmppart.cpp
cmppart.h)
target_link_libraries(cmppart target_link_libraries(cmppart
PUBLIC PUBLIC
Physis::Physis Physis::Physis

9
parts/mdl/CMakeLists.txt
View file

@ -2,7 +2,8 @@
# SPDX-License-Identifier: CC0-1.0 # SPDX-License-Identifier: CC0-1.0
add_library(mdlpart STATIC) add_library(mdlpart STATIC)
target_sources(mdlpart PRIVATE target_sources(mdlpart
PRIVATE
mdlexport.cpp mdlexport.cpp
mdlexport.h mdlexport.h
mdlimport.cpp mdlimport.cpp
@ -10,9 +11,9 @@ target_sources(mdlpart PRIVATE
mdlpart.cpp mdlpart.cpp
mdlpart.h mdlpart.h
vulkanwindow.cpp vulkanwindow.cpp
vulkanwindow.h vulkanwindow.h)
) target_link_libraries(mdlpart
target_link_libraries(mdlpart PUBLIC PUBLIC
Novus::Renderer Novus::Renderer
Novus::Common Novus::Common
Physis::Physis Physis::Physis

3
parts/shpk/CMakeLists.txt
View file

@ -7,7 +7,8 @@ find_package(SPIRV-Headers REQUIRED)
add_library(shpkpart STATIC) add_library(shpkpart STATIC)
target_sources(shpkpart PRIVATE shpkpart.cpp) target_sources(shpkpart PRIVATE shpkpart.cpp)
target_link_libraries(shpkpart PUBLIC target_link_libraries(shpkpart
PUBLIC
Novus::Common Novus::Common
Physis::Physis Physis::Physis
dxbc dxbc

3
parts/sklb/CMakeLists.txt
View file

@ -2,7 +2,8 @@
# SPDX-License-Identifier: CC0-1.0 # SPDX-License-Identifier: CC0-1.0
add_library(sklbpart STATIC) add_library(sklbpart STATIC)
target_sources(sklbpart PRIVATE target_sources(sklbpart
PRIVATE
sklbpart.cpp sklbpart.cpp
sklbpart.h) sklbpart.h)
target_link_libraries(sklbpart target_link_libraries(sklbpart

3
parts/tex/CMakeLists.txt
View file

@ -2,7 +2,8 @@
# SPDX-License-Identifier: CC0-1.0 # SPDX-License-Identifier: CC0-1.0
add_library(texpart STATIC) add_library(texpart STATIC)
target_sources(texpart PRIVATE target_sources(texpart
PRIVATE
imagelabel.cpp imagelabel.cpp
imagelabel.h imagelabel.h
texpart.cpp texpart.cpp

10
renderer/CMakeLists.txt
View file

@ -2,12 +2,15 @@
# SPDX-License-Identifier: CC0-1.0 # SPDX-License-Identifier: CC0-1.0
add_library(renderer STATIC) add_library(renderer STATIC)
target_sources(renderer PRIVATE target_sources(renderer
PRIVATE
include/renderer.hpp include/renderer.hpp
src/renderer.cpp src/renderer.cpp
src/imguipass.cpp src/imguipass.cpp
src/imguipass.h) src/imguipass.h)
qt_add_resources(renderer "shaders" qt_add_resources(renderer
"shaders"
PREFIX "/" PREFIX "/"
FILES FILES
shaders/imgui.frag.spv shaders/imgui.frag.spv
@ -15,7 +18,8 @@ qt_add_resources(renderer "shaders"
shaders/mesh.frag.spv shaders/mesh.frag.spv
shaders/mesh.vert.spv) shaders/mesh.vert.spv)
target_include_directories(renderer PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include) target_include_directories(renderer PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include)
target_link_libraries(renderer PUBLIC target_link_libraries(renderer
PUBLIC
Qt6::Core Qt6::Core
Vulkan::Vulkan Vulkan::Vulkan
Physis::Physis Physis::Physis

9
sagasu/CMakeLists.txt
View file

@ -2,7 +2,8 @@
# SPDX-License-Identifier: CC0-1.0 # SPDX-License-Identifier: CC0-1.0
add_library(novus-sagasu-static STATIC) add_library(novus-sagasu-static STATIC)
target_sources(novus-sagasu-static PRIVATE target_sources(novus-sagasu-static
PRIVATE
include/hashdatabase.h include/hashdatabase.h
src/hashdatabase.cpp) src/hashdatabase.cpp)
target_link_libraries(novus-sagasu-static target_link_libraries(novus-sagasu-static
@ -14,8 +15,7 @@ target_link_libraries(novus-sagasu-static
target_include_directories(novus-sagasu-static PRIVATE include) target_include_directories(novus-sagasu-static PRIVATE include)
add_executable(novus-sagasu-indexer) add_executable(novus-sagasu-indexer)
target_sources(novus-sagasu-indexer PRIVATE target_sources(novus-sagasu-indexer PRIVATE src/indexer.cpp)
src/indexer.cpp)
target_link_libraries(novus-sagasu-indexer target_link_libraries(novus-sagasu-indexer
PRIVATE PRIVATE
novus-sagasu-static novus-sagasu-static
@ -23,7 +23,8 @@ target_link_libraries(novus-sagasu-indexer
target_include_directories(novus-sagasu-indexer PRIVATE include) target_include_directories(novus-sagasu-indexer PRIVATE include)
add_executable(novus-sagasu) add_executable(novus-sagasu)
target_sources(novus-sagasu PRIVATE target_sources(novus-sagasu
PRIVATE
src/main.cpp src/main.cpp
src/mainwindow.cpp src/mainwindow.cpp
src/filetreewindow.cpp src/filetreewindow.cpp