Skip to content

Commit 65ea2b6

Browse files
author
Oleh Kulykov
committed
1722265067
1 parent 5d7b32d commit 65ea2b6

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

.github/workflows/cmake-cygwin.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ jobs:
3737
gcc --version
3838
g++ --version
3939
mingw32-make --version
40+
touch foo.h
41+
gcc -E -dM foo.h
4042
4143
- name: Set reusable strings
4244
# Turn repeated input strings (such as the build output directory) into step outputs. These step outputs can be used throughout the workflow file.

CMakeLists.txt

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ More info: https://docs.microsoft.com/en-us/cpp/build/reference/md-mt-ld-use-run
100100
if (WIN32 OR WIN64)
101101
add_definitions(-DUNICODE=1)
102102
add_definitions(-D_UNICODE=1)
103+
103104
if (WIN64 OR CMAKE_SIZEOF_VOID_P EQUAL 8)
104105
message("WIN 64")
105106
add_definitions(-DWIN64=1)
@@ -111,6 +112,12 @@ if (WIN32 OR WIN64)
111112
else()
112113
message("WIN.. undefined")
113114
endif()
115+
116+
if (MINGW)
117+
add_definitions(-DLIBPLZMA_MINGW=1)
118+
message("MinGW")
119+
endif()
120+
114121
endif()
115122

116123
if (MSVC)
@@ -155,11 +162,7 @@ if (MSVC)
155162
endif()
156163

157164
else()
158-
if (MINGW)
159-
add_definitions(-DLIBPLZMA_MINGW=1)
160-
message("MinGW")
161-
endif()
162-
165+
163166
# C with -fPIC
164167
check_c_compiler_flag("-fPIC" WITH_FPIC_C)
165168
if (WITH_FPIC_C)

0 commit comments

Comments
 (0)