Skip to content

Commit

Permalink
Per the README of LabSound, make the compiler version C++11 (was C++17)
Browse files Browse the repository at this point in the history
  • Loading branch information
jkoutavas committed Feb 26, 2018
1 parent 8b92b8b commit 26144eb
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 8 deletions.
2 changes: 1 addition & 1 deletion cmake/LabSound.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ add_library(LabSound STATIC
${third_rtaudio} ${third_kissfft}
)

_set_Cxx17(LabSound)
_set_CxxVer(LabSound)
_set_compile_options(LabSound)

target_include_directories(LabSound PUBLIC
Expand Down
6 changes: 2 additions & 4 deletions cmake/defaults/CXXhelpers.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,8 @@ function(_disable_warning flag)
set(_LAB_CXX_WARNING_FLAGS ${_LAB_CXX_WARNING_FLAGS} PARENT_SCOPE)
endfunction()

function(_set_Cxx17 proj)
if(APPLE OR WIN32)
target_compile_features(${proj} INTERFACE cxx_std_17)
endif()
function(_set_CxxVer proj)
target_compile_features(${proj} INTERFACE cxx_std_11)
endfunction()

function(_set_compile_options proj)
Expand Down
2 changes: 1 addition & 1 deletion cmake/examples.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ set(src "${LABSOUND_ROOT}/examples/src/ExamplesMain.cpp")

add_executable(example ${src})

_set_Cxx17(example)
_set_CxxVer(example)
_set_compile_options(example)


Expand Down
4 changes: 2 additions & 2 deletions cmake/libnyquist.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ file(GLOB third_opus_src

add_library(libopus STATIC ${third_opus_src})

_set_Cxx17(libopus)
_set_CxxVer(libopus)
_set_compile_options(libopus)

if (WIN32)
Expand Down Expand Up @@ -97,7 +97,7 @@ add_library(libnyquist STATIC
${third_musepack_dec} ${third_musepack_enc}
${third_wavpack} ${third_modplug})

_set_Cxx17(libnyquist)
_set_CxxVer(libnyquist)
_set_compile_options(libnyquist)

if (WIN32)
Expand Down

0 comments on commit 26144eb

Please sign in to comment.