mii/libdatachannel
1
0
Fork 0
mirror of https://github.com/mii443/libdatachannel.git synced 2025-08-22 15:15:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make setting OUTPUT_NAME work in UWP.

Browse Source
This commit is contained in:
Hanseul Jun
2021-02-03 02:59:56 -08:00
parent 433d5fbe7f
commit 1b74ebb0f4
3 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -311,9 +311,7 @@ if(NOT NO_TESTS)
set_target_properties(datachannel-tests PROPERTIES set_target_properties(datachannel-tests PROPERTIES
VERSION ${PROJECT_VERSION} VERSION ${PROJECT_VERSION}
CXX_STANDARD 17) CXX_STANDARD 17)
if(NOT CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") # Prevent a bug in manifest generation for UWP set_target_properties(datachannel-tests PROPERTIES OUTPUT_NAME tests)
set_target_properties(datachannel-tests PROPERTIES OUTPUT_NAME tests)
endif()
target_include_directories(datachannel-tests PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src) target_include_directories(datachannel-tests PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src)
target_link_libraries(datachannel-tests datachannel) target_link_libraries(datachannel-tests datachannel)
@ -327,9 +325,7 @@ if(NOT NO_TESTS)
set_target_properties(datachannel-benchmark PROPERTIES set_target_properties(datachannel-benchmark PROPERTIES
VERSION ${PROJECT_VERSION} VERSION ${PROJECT_VERSION}
CXX_STANDARD 17) CXX_STANDARD 17)
if(NOT CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") # Prevent a bug in manifest generation for UWP set_target_properties(datachannel-benchmark PROPERTIES OUTPUT_NAME benchmark)
set_target_properties(datachannel-benchmark PROPERTIES OUTPUT_NAME benchmark)
endif()
target_compile_definitions(datachannel-benchmark PRIVATE BENCHMARK_MAIN=1) target_compile_definitions(datachannel-benchmark PRIVATE BENCHMARK_MAIN=1)
target_include_directories(datachannel-benchmark PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src) target_include_directories(datachannel-benchmark PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src)
target_link_libraries(datachannel-benchmark datachannel) target_link_libraries(datachannel-benchmark datachannel)

2
test/uwp-benchmark/package.appxManifest
View File

@ -23,7 +23,7 @@
<Applications> <Applications>
<Application <Application
Id="App" Id="App"
Executable="datachannel-benchmark.exe" Executable="benchmark.exe"
EntryPoint="datachannel-benchmark.App" EntryPoint="datachannel-benchmark.App"
desktop4:Subsystem="console" desktop4:Subsystem="console"
desktop4:SupportsMultipleInstances="true" desktop4:SupportsMultipleInstances="true"

2
test/uwp-tests/package.appxManifest
View File

@ -23,7 +23,7 @@
<Applications> <Applications>
<Application <Application
Id="App" Id="App"
Executable="datachannel-tests.exe" Executable="tests.exe"
EntryPoint="datachannel-tests.App" EntryPoint="datachannel-tests.App"
desktop4:Subsystem="console" desktop4:Subsystem="console"
desktop4:SupportsMultipleInstances="true" desktop4:SupportsMultipleInstances="true"