Skip to content

Commit

Permalink
Move to latest surge submodule; C++20 (#1004)
Browse files Browse the repository at this point in the history
* Move to latest surge submodule; C++20

* Momentarily stick on 2.5.1 for the pipelines
  • Loading branch information
baconpaul authored May 27, 2024
1 parent 078c057 commit 4241e5c
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-plugin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Build VCV Rack Plugin
on: [push, pull_request]

env:
rack-sdk-version: latest
rack-sdk-version: 2.5.1
rack-plugin-toolchain-dir: /home/build/rack-plugin-toolchain

defaults:
Expand Down
8 changes: 2 additions & 6 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.16)
set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9" CACHE STRING "Minimum OS X deployment version")
project(SurgeXTRack VERSION 1.0 LANGUAGES C CXX)

set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD 20)
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)

set(PLUGIN_NAME ${PROJECT_NAME})
Expand Down Expand Up @@ -70,10 +70,6 @@ target_compile_options(surge-common PRIVATE -Wno-sign-compare -Wno-ignored-quali
target_compile_options(surge-common PRIVATE $<$<STREQUAL:${CMAKE_OSX_ARCHITECTURES},arm64>:-faligned-allocation>)

add_compile_options($<$<BOOL:${SURGE_XT_WARNINGS_ARE_ERRORS}>:-Werror>)
if (CMAKE_CXX_STANDARD GREATER_EQUAL 20)
message(STATUS "Turning on fno-char8_t for c++20")
add_compile_options($<$<COMPILE_LANGUAGE:CXX>:-fno-char8_t>)
endif()
add_compile_definitions($<$<CONFIG:Debug>:SURGEXT_RACK_DEBUG>)

add_library(Surge INTERFACE)
Expand Down Expand Up @@ -112,7 +108,7 @@ target_sources(${RACK_PLUGIN_LIB} PRIVATE
src/XTWidgets.cpp)

target_link_libraries(${RACK_PLUGIN_LIB} PRIVATE Surge sst-rackhelpers)
target_compile_options(${RACK_PLUGIN_LIB} PUBLIC -Wno-sign-compare)
target_compile_options(${RACK_PLUGIN_LIB} PUBLIC -Wno-sign-compare -fno-char8_t)

file(COPY surge/resources/surge-shared/configuration.xml
surge/resources/surge-shared/windows.wt
Expand Down

0 comments on commit 4241e5c

Please sign in to comment.