Skip to content

Commit adf1f2b

Browse files
committed
0.7.0
1 parent 84f6b3c commit adf1f2b

23 files changed

Lines changed: 910 additions & 126 deletions

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
!CMakePresets.json
1717
!README.md
1818
!LICENSE*
19+
!*.cmake
1920

2021
!/lib
2122
!.vscode

CMakeLists.txt

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,17 @@
11
cmake_minimum_required(VERSION 3.28...3.30)
22

3-
set(CMAKE_COMPILE_WARNING_AS_ERROR OFF)
4-
3+
include(./lib/atkaudio/cmake/preconfig.cmake)
54
include("${CMAKE_CURRENT_SOURCE_DIR}/cmake/common/bootstrap.cmake")
6-
string(JSON _displayName GET ${buildspec} displayName)
7-
string(JSON _windowsApp GET ${buildspec} uuids windowsApp)
85

96
project(${_name} VERSION ${_version})
107

11-
option(ENABLE_FRONTEND_API "Use obs-frontend-api for UI functionality" OFF)
12-
option(ENABLE_QT "Use Qt functionality" OFF)
8+
option(ENABLE_FRONTEND_API "Use obs-frontend-api for UI functionality" ON)
9+
option(ENABLE_QT "Use Qt functionality" ON)
1310

1411
include(compilerconfig)
1512
include(defaults)
1613
include(helpers)
1714

18-
1915
add_library(${CMAKE_PROJECT_NAME} MODULE)
2016

2117
find_package(libobs REQUIRED)
@@ -39,7 +35,7 @@ if(ENABLE_QT)
3935
)
4036
endif()
4137

42-
file(GLOB_RECURSE _sources CONFIGURE_DEPENDS src/*.c*)
38+
file(GLOB_RECURSE _sources CONFIGURE_DEPENDS src/*.cpp)
4339
target_sources(${CMAKE_PROJECT_NAME} PRIVATE ${_sources})
4440

4541
set_target_properties_plugin(${CMAKE_PROJECT_NAME} PROPERTIES OUTPUT_NAME ${_name})
@@ -50,7 +46,4 @@ set_target_properties(${CMAKE_PROJECT_NAME} PROPERTIES CXX_STANDARD 23)
5046

5147
add_subdirectory(lib/atkaudio)
5248

53-
# Sanitize CMAKE_INSTALL_PREFIX path (convert to CMake style and remove trailing slash)
54-
file(TO_CMAKE_PATH "${CMAKE_INSTALL_PREFIX}" _sanitized_prefix)
55-
string(REGEX REPLACE "/$" "" _sanitized_prefix "${_sanitized_prefix}")
56-
set(CMAKE_INSTALL_PREFIX "${_sanitized_prefix}" CACHE PATH "Sanitized install prefix" FORCE)
49+
include(./lib/atkaudio/cmake/cpack.cmake)

CMakePresets.json

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@
1010
"name": "template",
1111
"hidden": true,
1212
"cacheVariables": {
13-
"ENABLE_FRONTEND_API": false,
14-
"ENABLE_QT": false
13+
"CMAKE_COMPILE_WARNING_AS_ERROR": false,
14+
"ENABLE_FRONTEND_API": true,
15+
"ENABLE_QT": true
1516
}
1617
},
1718
{
@@ -48,7 +49,7 @@
4849
"description": "Build for macOS 11.0+ (Universal binary) for CI",
4950
"generator": "Xcode",
5051
"cacheVariables": {
51-
"CMAKE_COMPILE_WARNING_AS_ERROR": true,
52+
"CMAKE_COMPILE_WARNING_AS_ERROR": false,
5253
"ENABLE_CCACHE": true
5354
}
5455
},
@@ -102,8 +103,9 @@
102103
"deprecated": true
103104
},
104105
"cacheVariables": {
105-
"CMAKE_BUILD_TYPE": "Release",
106-
"CMAKE_INSTALL_LIBDIR": "lib/CMAKE_SYSTEM_PROCESSOR-linux-gnu"
106+
"CMAKE_BUILD_TYPE": "RelWithDebInfo",
107+
"CMAKE_INSTALL_LIBDIR": "lib/CMAKE_SYSTEM_PROCESSOR-linux-gnu",
108+
"CMAKE_POSITION_INDEPENDENT_CODE": true
107109
}
108110
},
109111
{
@@ -114,8 +116,8 @@
114116
"displayName": "Ubuntu x86_64 CI build",
115117
"description": "Build for Ubuntu x86_64 on CI",
116118
"cacheVariables": {
117-
"CMAKE_BUILD_TYPE": "Release",
118-
"CMAKE_COMPILE_WARNING_AS_ERROR": true,
119+
"CMAKE_BUILD_TYPE": "RelWithDebInfo",
120+
"CMAKE_COMPILE_WARNING_AS_ERROR": false,
119121
"ENABLE_CCACHE": true
120122
}
121123
}
@@ -126,42 +128,42 @@
126128
"configurePreset": "macos",
127129
"displayName": "macOS Universal",
128130
"description": "macOS build for Universal architectures",
129-
"configuration": "Debug"
131+
"configuration": "RelWithDebInfo"
130132
},
131133
{
132134
"name": "macos-ci",
133135
"configurePreset": "macos-ci",
134136
"displayName": "macOS Universal CI",
135137
"description": "macOS CI build for Universal architectures",
136-
"configuration": "Release"
138+
"configuration": "RelWithDebInfo"
137139
},
138140
{
139141
"name": "windows-x64",
140142
"configurePreset": "windows-x64",
141143
"displayName": "Windows x64",
142144
"description": "Windows build for x64",
143-
"configuration": "Debug"
145+
"configuration": "RelWithDebInfo"
144146
},
145147
{
146148
"name": "windows-ci-x64",
147149
"configurePreset": "windows-ci-x64",
148150
"displayName": "Windows x64 CI",
149-
"description": "Windows CI build for x64 (Release configuration)",
150-
"configuration": "Release"
151+
"description": "Windows CI build for x64 (RelWithDebInfo configuration)",
152+
"configuration": "RelWithDebInfo"
151153
},
152154
{
153155
"name": "ubuntu-x86_64",
154156
"configurePreset": "ubuntu-x86_64",
155157
"displayName": "Ubuntu x86_64",
156158
"description": "Ubuntu build for x86_64",
157-
"configuration": "Release"
159+
"configuration": "RelWithDebInfo"
158160
},
159161
{
160162
"name": "ubuntu-ci-x86_64",
161163
"configurePreset": "ubuntu-ci-x86_64",
162164
"displayName": "Ubuntu x86_64 CI",
163165
"description": "Ubuntu CI build for x86_64",
164-
"configuration": "Release"
166+
"configuration": "RelWithDebInfo"
165167
}
166168
]
167169
}

0 commit comments

Comments
 (0)