File tree Expand file tree Collapse file tree 6 files changed +6
-37
lines changed Expand file tree Collapse file tree 6 files changed +6
-37
lines changed Original file line number Diff line number Diff line change @@ -50,11 +50,6 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON)
50
50
# 3P dependencies.
51
51
include (BuildFmt )
52
52
include (BuildSpdlog )
53
-
54
- if (BUILD_LINUX_MIDDLEWARE )
55
- include (BuildMingwStdThreads )
56
- endif ()
57
-
58
53
include (BuildGoogleTest )
59
54
60
55
if (BUILD_TESTS )
Original file line number Diff line number Diff line change @@ -48,7 +48,7 @@ sudo apt install windows-fido-bridge
48
48
You can also build this repository from source:
49
49
50
50
```
51
- sudo apt install build-essential cmake g++-mingw-w64-x86-64 git
51
+ sudo apt install build-essential cmake g++-mingw-w64-x86-64-posix git
52
52
53
53
git clone https://github.com/mgbowen/windows-fido-bridge.git
54
54
cd windows-fido-bridge
Original file line number Diff line number Diff line change @@ -22,8 +22,6 @@ add_subdirectory(${googletest_SOURCE_DIR} ${googletest_BINARY_DIR})
22
22
if (MINGW )
23
23
# When cross-compiling with MinGW, make the Google Test-generated
24
24
# executables statically-linked to allow them to run with no extra DLLs.
25
- include (BuildMingwStdThreads )
26
-
27
- target_link_libraries (gtest PUBLIC -static mingw_stdthreads )
28
- target_link_libraries (gtest_main PUBLIC -static mingw_stdthreads )
25
+ target_link_libraries (gtest PUBLIC -static )
26
+ target_link_libraries (gtest_main PUBLIC -static )
29
27
endif ()
Load Diff This file was deleted.
Original file line number Diff line number Diff line change 1
1
include (BuildFmt )
2
- include (BuildMingwStdThreads )
3
2
4
3
include (FetchContent )
5
4
@@ -22,5 +21,5 @@ option(SPDLOG_FMT_EXTERNAL "" ON)
22
21
add_subdirectory (${spdlog_SOURCE_DIR} ${spdlog_BINARY_DIR} )
23
22
24
23
if (MINGW )
25
- target_link_libraries (spdlog PUBLIC mingw_stdthreads fmt )
24
+ target_link_libraries (spdlog PUBLIC fmt )
26
25
endif ()
Original file line number Diff line number Diff line change @@ -2,8 +2,8 @@ set(CMAKE_SYSTEM_NAME Windows)
2
2
set (CMAKE_SYSTEM_PROCESSOR x86_64 )
3
3
4
4
set (prefix x86_64-w64-mingw32- )
5
- set (CMAKE_C_COMPILER ${prefix} gcc )
6
- set (CMAKE_CXX_COMPILER ${prefix} g++ )
5
+ set (CMAKE_C_COMPILER ${prefix} gcc-posix )
6
+ set (CMAKE_CXX_COMPILER ${prefix} g++-posix )
7
7
8
8
set (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER )
9
9
set (CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY )
You can’t perform that action at this time.
0 commit comments