Update build instructions in README
+ Clean up CMakeLists and remove some unused includes + Remove unused Qt translations file
This commit is contained in:
@@ -9,7 +9,7 @@ project(
|
||||
#[[NAME]] Qtk
|
||||
VERSION 1.0
|
||||
DESCRIPTION "An example project using QT and OpenGL"
|
||||
LANGUAGES CXX
|
||||
LANGUAGES CXX C
|
||||
)
|
||||
|
||||
set(CMAKE_INCLUDE_CURRENT_DIR ON)
|
||||
@@ -26,13 +26,9 @@ find_package(Qt5 COMPONENTS Core LinguistTools Gui Widgets REQUIRED)
|
||||
set(SOURCES app/main.cpp)
|
||||
qt5_add_resources(SOURCES resources.qrc)
|
||||
|
||||
# Set translation files
|
||||
set(TS_FILES qtk_en_US.ts)
|
||||
|
||||
add_executable(
|
||||
qtk # Executable name
|
||||
${SOURCES} # Executable source code
|
||||
${TS_FILES} # Link translation files
|
||||
)
|
||||
|
||||
|
||||
@@ -40,36 +36,12 @@ add_executable(
|
||||
# External Libraries
|
||||
################################################################################
|
||||
|
||||
# Find and link GLUT package; Otherwise show an error
|
||||
find_package(GLUT REQUIRED)
|
||||
if (!GLUT_FOUND)
|
||||
message(
|
||||
"Error: CMake was unable to find the GLUT package\n"
|
||||
"Please install GLUT (freeglut3-dev) and try again\n"
|
||||
"sudo apt install freeglut3-dev\n"
|
||||
)
|
||||
endif()
|
||||
|
||||
# Find and link OpenGL package; Otherwise show an error
|
||||
set(OpenGL_GL_PREFERENCE LEGACY)
|
||||
find_package(OpenGL REQUIRED)
|
||||
if (!OPENGL_FOUND)
|
||||
message(
|
||||
"Error: CMake was unable to find the OpenGL package\n"
|
||||
"Please install OpenGL and try again\n"
|
||||
"sudo apt install mesa-utils\n"
|
||||
)
|
||||
endif()
|
||||
|
||||
# https://github.com/assimp/assimp/commit/6ac8279977c3a54118551e549d77329497116f66
|
||||
find_package(assimp REQUIRED)
|
||||
if (!assimp_FOUND)
|
||||
message(
|
||||
"Error: CMake was unable to find the Assimp package\n"
|
||||
"Please install Assimp and try again\n"
|
||||
"sudo apt install libassimp-dev\n"
|
||||
)
|
||||
endif()
|
||||
|
||||
|
||||
################################################################################
|
||||
@@ -79,17 +51,8 @@ endif()
|
||||
# Mainwidget
|
||||
add_library(main-widget lib/mainwidget.cpp)
|
||||
target_include_directories(main-widget PUBLIC lib/)
|
||||
#target_link_libraries(main-widget PUBLIC Qt5::Widgets)
|
||||
# + This lib and all linked targets will also link to OpenGL
|
||||
target_include_directories(main-widget PUBLIC ${OPENGL_INCLUDE_DIR})
|
||||
target_link_libraries(main-widget PUBLIC ${OPENGL_LIBRARIES})
|
||||
|
||||
# Model
|
||||
add_library(model lib/model.cpp)
|
||||
target_include_directories(model PRIVATE ${ASSIMP_INCLUDE_DIR})
|
||||
target_link_libraries(model PRIVATE ${ASSIMP_LIBRARIES})
|
||||
target_link_libraries(model PUBLIC Qt5::Widgets)
|
||||
target_link_libraries(model PRIVATE main-widget)
|
||||
target_include_directories(main-widget PRIVATE ${OPENGL_INCLUDE_DIR})
|
||||
target_link_libraries(main-widget PRIVATE ${OPENGL_LIBRARIES})
|
||||
|
||||
# Input
|
||||
add_library(input lib/input.cpp)
|
||||
@@ -101,16 +64,6 @@ add_library(mesh lib/mesh.cpp)
|
||||
target_include_directories(mesh PUBLIC lib/)
|
||||
target_link_libraries(mesh PUBLIC Qt5::Widgets)
|
||||
|
||||
# Transform3D
|
||||
add_library(transform3d lib/transform3D.cpp)
|
||||
target_include_directories(transform3d PUBLIC lib/)
|
||||
target_link_libraries(transform3d PUBLIC Qt5::Widgets)
|
||||
|
||||
# Camera3D
|
||||
add_library(camera3d lib/camera3d.cpp)
|
||||
target_include_directories(camera3d PUBLIC lib/)
|
||||
target_link_libraries(camera3d PUBLIC Qt5::Widgets)
|
||||
|
||||
# Texture
|
||||
add_library(texture lib/texture.cpp)
|
||||
target_include_directories(texture PUBLIC lib/)
|
||||
@@ -126,27 +79,42 @@ add_library(meshrenderer lib/meshrenderer.cpp)
|
||||
target_include_directories(meshrenderer PUBLIC lib/)
|
||||
target_link_libraries(meshrenderer PUBLIC Qt5::Widgets)
|
||||
|
||||
# Camera3D
|
||||
add_library(camera3d lib/camera3d.cpp)
|
||||
target_include_directories(camera3d PUBLIC lib/)
|
||||
target_link_libraries(camera3d PUBLIC Qt5::Widgets)
|
||||
|
||||
# Skybox
|
||||
add_library(skybox lib/skybox.cpp)
|
||||
target_link_libraries(skybox PUBLIC Qt5::Widgets)
|
||||
target_link_libraries(skybox PRIVATE mesh)
|
||||
# Skybox needs Mesh and Camera3D and Qt5::Widgets
|
||||
target_link_libraries(skybox PRIVATE camera3d)
|
||||
|
||||
# Transform3D
|
||||
add_library(transform3d lib/transform3D.cpp)
|
||||
target_include_directories(transform3d PUBLIC lib/)
|
||||
target_link_libraries(transform3d PUBLIC Qt5::Widgets)
|
||||
|
||||
# Model
|
||||
add_library(model lib/model.cpp)
|
||||
target_include_directories(model PUBLIC lib/)
|
||||
target_link_libraries(model PRIVATE assimp)
|
||||
# Model library requires transform3d and Qt5::Widgets
|
||||
target_link_libraries(model PUBLIC transform3d)
|
||||
|
||||
|
||||
################################################################################
|
||||
# Final Application
|
||||
################################################################################
|
||||
|
||||
target_link_libraries(main-widget PUBLIC model)
|
||||
target_link_libraries(main-widget PUBLIC input)
|
||||
target_link_libraries(main-widget PUBLIC transform3d)
|
||||
target_link_libraries(main-widget PUBLIC object)
|
||||
target_link_libraries(main-widget PUBLIC meshrenderer)
|
||||
target_link_libraries(main-widget PUBLIC texture)
|
||||
target_link_libraries(main-widget PUBLIC skybox)
|
||||
target_link_libraries(main-widget PUBLIC mesh)
|
||||
target_link_libraries(main-widget PRIVATE input)
|
||||
target_link_libraries(main-widget PRIVATE transform3d)
|
||||
target_link_libraries(main-widget PRIVATE object)
|
||||
target_link_libraries(main-widget PRIVATE meshrenderer)
|
||||
target_link_libraries(main-widget PRIVATE texture)
|
||||
target_link_libraries(main-widget PRIVATE skybox)
|
||||
target_link_libraries(main-widget PRIVATE mesh)
|
||||
|
||||
# Link qtk executable to main main-widget library
|
||||
target_link_libraries(qtk PUBLIC main-widget)
|
||||
|
||||
# Set up QT Linguist translation
|
||||
qt5_create_translation(QM_FILES ${CMAKE_SOURCE_DIR} ${TS_FILES})
|
||||
|
||||
Reference in New Issue
Block a user