Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/cpp-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
uses: microsoft/setup-msbuild@v2

- name: CMake
run: cmake -S ${{env.SOURCE_DIR}} -B ${{env.BUILD_DIR}} -A x64 -DBUILD_TESTING=ON
run: cmake -S ${{env.SOURCE_DIR}} -B ${{env.BUILD_DIR}} -A x64 -DBUILD_TESTING=ON -DBUILD_TOOLS=OFF

- name: Build
run: cmake --build ${{env.BUILD_DIR}} --config RelWithDebInfo
Expand Down
7 changes: 6 additions & 1 deletion Sources/backend-cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,17 @@ if(BUILD_TESTING)
DOWNLOAD_EXTRACT_TIMESTAMP TRUE
)

# For Windows: Prevent overriding the parent project's compiler/linker settings
# For Windows: Prevent overriding parent project's compiler/linker settings
set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)

FetchContent_MakeAvailable(googletest)
endif()

# Tools
if(BUILD_TOOLS)
add_subdirectory(Tools)
endif()

# Libraries
add_subdirectory(Vendor)
add_subdirectory(Utilities)
Expand Down
13 changes: 13 additions & 0 deletions Sources/backend-cpp/Tools/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
add_executable(SocketTester)

target_sources(SocketTester PRIVATE SocketTester.cpp)

target_link_libraries(SocketTester PRIVATE Utilities)

target_compile_definitions(SocketTester PRIVATE _CONSOLE)

# Output Directory
set_target_properties(
SocketTester
PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/SocketTester_bin"
)
196 changes: 0 additions & 196 deletions Tools/SocketTester/SocketTester.vcxproj

This file was deleted.

Binary file removed Tools/SocketTester/bin/SocketTester.exe
Binary file not shown.
Binary file removed Tools/SocketTester/bin/lua.dll
Binary file not shown.
4 changes: 0 additions & 4 deletions Tools/SocketTester/packages.config

This file was deleted.

6 changes: 4 additions & 2 deletions Tools/build_plugin.bat
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@echo off

:: Build script for streamdeck-dcs.
:: Instructions: You must call this file from the "Developer Command Prompt for VS"
:: For details see https://docs.microsoft.com/en-us/cpp/build/building-on-the-command-line
Expand All @@ -6,12 +8,12 @@
cd /D "%~dp0"\..

:: Build C++ executable:
cmake -S ./Sources/backend-cpp -B ./Sources/backend-cpp/build
cmake -S ./Sources/backend-cpp -B ./Sources/backend-cpp/build -DBUILD_TESTING=ON -DBUILD_TOOLS=OFF
cmake --build ./Sources/backend-cpp/build --config Release
if %errorlevel% neq 0 echo "Canceling plugin build due to failed backend build" && pause && exit /b %errorlevel%

:: Run unit tests, only continue if all tests pass
ctest --test-dir ./Sources/backend-cpp/build --output-on-failure
ctest --test-dir ./Sources/backend-cpp/build --output-on-failure --progress
if %errorlevel% neq 0 echo "Canceling plugin build due to failed unit tests" && pause && exit /b %errorlevel%

:: Copy C++ executable and DLLs to StreamDeck Plugin package:
Expand Down