cmake cleanups

This commit is contained in:
Kevin Matz 2021-08-14 20:40:53 -04:00
parent 7981acc57b
commit 518f9826de
4 changed files with 105 additions and 99 deletions

View File

@ -1,18 +1,21 @@
cmake_minimum_required(VERSION 3.14)
set(CMAKE_INCLUDE_CURRENT_DIR ON)
# set the project name and version
project(ESTA VERSION 0.1.1)
project(ESTA VERSION 0.1.1 LANGUAGES CXX)
set(DEFAULT_BUILD_TYPE "Release")
configure_file(config.h.in config.h)
add_compile_definitions(BUILT_WITH_CMAKE)
# specify the C++ standard
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti")
if (CMAKE_BUILD_TYPE STREQUAL "Debug")
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_GLIBCXX_DEBUG")
endif()
set(CMAKE_AUTOUIC OFF)
set(CMAKE_AUTOMOC OFF)
set(CMAKE_AUTORCC OFF)
@ -111,3 +114,4 @@ set_target_properties(${PROJECT_NAME} PROPERTIES VERSION ${PROJECT_VERSION})
set_target_properties(${PROJECT_NAME} PROPERTIES SOVERSION ${PROJECT_VERSION})
target_compile_definitions(${PROJECT_NAME} PUBLIC ${PROJECT_NAME}_LIBRARY)
target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})

View File

@ -1,8 +1,7 @@
cmake_minimum_required(VERSION 3.14)
project(QsACNNode LANGUAGES CXX)
project(QsACNNode VERSION 0.1 LANGUAGES CXX)
set(CMAKE_INCLUDE_CURRENT_DIR ON)
set(CMAKE_AUTOUIC ON)
set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTORCC ON)
@ -25,6 +24,9 @@ add_library(${PROJECT_NAME} STATIC
universemodel.cpp
)
target_link_libraries(${PROJECT_NAME} PUBLIC Qt${QT_VERSION_MAJOR}::Network Qt${QT_VERSION_MAJOR}::Gui ESTA)
target_link_libraries(${PROJECT_NAME} PUBLIC Qt${QT_VERSION_MAJOR}::Network Qt${QT_VERSION_MAJOR}::Gui)
target_link_libraries(${PROJECT_NAME} PUBLIC ESTA)
target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
target_compile_definitions(${PROJECT_NAME} PUBLIC QT_LIBRARY)

View File

@ -1,7 +1,7 @@
#pragma once
#include "qsacnnode_global.h"
#include "../../sacn/node.h"
#include "sacn/node.h"
#include <QHash>
#include <QHostAddress>

View File

@ -3,7 +3,7 @@
#include <QObject>
#include "qsacnnode_global.h"
#include "../../sacn/universe.h"
#include "sacn/universe.h"
/**
* @brief The QSacnUniverse class