Merge remote-tracking branch 'origin/main' into dev
This commit is contained in:
+9
-22
@@ -169,10 +169,10 @@ if (CMAKE_BUILD_TYPE MATCHES Debug)
|
||||
endif()
|
||||
elseif(CMAKE_BUILD_TYPE MATCHES RelWithDebInfo)
|
||||
message(STATUS "RelWithgDebInfo build")
|
||||
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O3 -DNDEBUG" )
|
||||
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O3 -ffast-math -DNDEBUG" )
|
||||
else()
|
||||
message(STATUS "Release build")
|
||||
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -DNDEBUG" )
|
||||
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -ffast-math -DNDEBUG" )
|
||||
endif()
|
||||
|
||||
if (ENABLE_BACKTRACE)
|
||||
@@ -350,8 +350,7 @@ add_library(libpipedald STATIC ${PIPEDAL_SOURCES})
|
||||
|
||||
target_compile_definitions(libpipedald PUBLIC "_REENTRANT")
|
||||
|
||||
target_include_directories(libpipedald PUBLIC ${PIPEDAL_INCLUDES}
|
||||
)
|
||||
target_include_directories(libpipedald PUBLIC ${PIPEDAL_INCLUDES})
|
||||
|
||||
target_link_libraries(libpipedald
|
||||
PUBLIC
|
||||
@@ -394,10 +393,7 @@ target_include_directories(pipedald PRIVATE ${PIPEDAL_INCLUDES})
|
||||
target_compile_definitions(pipedald PRIVATE "ENABLE_BACKTRACE=${ENABLE_BACKTRACE}")
|
||||
|
||||
|
||||
target_link_libraries(pipedald PRIVATE PiPedalCommon
|
||||
|
||||
${PIPEDAL_LIBS}
|
||||
)
|
||||
target_link_libraries(pipedald PRIVATE PiPedalCommon ${PIPEDAL_LIBS})
|
||||
|
||||
|
||||
#################################
|
||||
@@ -448,15 +444,11 @@ add_executable(pipedaltest
|
||||
MemDebug.hpp
|
||||
)
|
||||
target_link_libraries(pipedaltest PRIVATE ${PIPEDAL_LIBS} ${ICU_LIBRARIES})
|
||||
target_include_directories(pipedaltest PRIVATE ${PIPEDAL_INCLUDES}
|
||||
)
|
||||
target_include_directories(pipedaltest PRIVATE ${PIPEDAL_INCLUDES})
|
||||
|
||||
set_target_properties(pipedaltest PROPERTIES EXCLUDE_FROM_ALL ${PIPEDAL_EXCLUDE_TESTS})
|
||||
|
||||
if (NOT GITHUB_ACTIONS) # Google perftools are not available on Github action servers.
|
||||
|
||||
|
||||
|
||||
add_executable(pipedalProfilePlugin
|
||||
profilePluginMain.cpp ArmPerformanceCounters.hpp
|
||||
)
|
||||
@@ -467,10 +459,8 @@ if (NOT GITHUB_ACTIONS) # Google perftools are not available on Github action se
|
||||
if (${DEBIAN_ARCHITECTURE} MATCHES arm64)
|
||||
target_compile_definitions(pipedalProfilePlugin PRIVATE "PIPEDAL_AARCH64")
|
||||
endif()
|
||||
|
||||
|
||||
|
||||
endif()
|
||||
|
||||
add_executable(jsonTest
|
||||
testMain.cpp
|
||||
jsonTest.cpp
|
||||
@@ -484,8 +474,7 @@ add_executable(jsonTest
|
||||
PromiseTest.cpp
|
||||
)
|
||||
target_link_libraries(jsonTest PRIVATE PiPedalCommon)
|
||||
target_include_directories(jsonTest PRIVATE ${PIPEDAL_INCLUDES}
|
||||
)
|
||||
target_include_directories(jsonTest PRIVATE ${PIPEDAL_INCLUDES})
|
||||
|
||||
set_target_properties(jsonTest PROPERTIES EXCLUDE_FROM_ALL ${PIPEDAL_EXCLUDE_TESTS})
|
||||
|
||||
@@ -710,8 +699,7 @@ if(ENABLE_VST3)
|
||||
# asan_options.cpp
|
||||
# )
|
||||
|
||||
target_include_directories(vst3test PRIVATE ${PIPEDAL_INCLUDES}
|
||||
)
|
||||
target_include_directories(vst3test PRIVATE ${PIPEDAL_INCLUDES})
|
||||
|
||||
|
||||
target_link_libraries(vst3test PRIVATE ${PIPEDAL_LIBS}
|
||||
@@ -773,8 +761,7 @@ add_executable(pipedal_latency_test
|
||||
CpuUse.cpp
|
||||
)
|
||||
|
||||
target_link_libraries(pipedal_latency_test PRIVATE pthread asound PiPedalCommon
|
||||
)
|
||||
target_link_libraries(pipedal_latency_test PRIVATE pthread asound PiPedalCommon)
|
||||
|
||||
|
||||
add_executable(pipedal_alsa_info
|
||||
|
||||
Reference in New Issue
Block a user