Skip to content

Commit aa7e9ab

Browse files
authored
Merge pull request #5531 from martin-frbg/issue5510
Fix CYGWIN builds that use CMake
2 parents f2d010d + f00c0d0 commit aa7e9ab

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

cmake/prebuild.cmake

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,6 @@ if (${COMPILER_ID} STREQUAL "GNU")
9999
endif ()
100100

101101
string(TOUPPER ${ARCH} UC_ARCH)
102-
103102
file(WRITE ${TARGET_CONF_TEMP}
104103
"#define OS_${HOST_OS}\t1\n"
105104
"#define ARCH_${UC_ARCH}\t1\n"
@@ -111,6 +110,10 @@ if (${HOST_OS} STREQUAL "WINDOWSSTORE")
111110
file(APPEND ${TARGET_CONF_TEMP}
112111
"#define OS_WINNT\t1\n")
113112
endif ()
113+
if (${HOST_OS} STREQUAL CYGWIN)
114+
file(APPEND ${TARGET_CONF_TEMP}
115+
"#define OS_CYGWIN_NT\t1\n")
116+
endif ()
114117

115118
# f_check
116119
if (NOT NOFORTRAN)

driver/others/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ if (USE_THREAD)
1313
set(BLAS_SERVER blas_server_omp.c)
1414
elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
1515
set(BLAS_SERVER blas_server_win32.c)
16+
elseif (${CMAKE_SYSTEM_NAME} STREQUAL CYGWIN)
17+
set(BLAS_SERVER blas_server_win32.c)
1618
elseif (${CMAKE_SYSTEM_NAME} STREQUAL "WindowsStore")
1719
set(BLAS_SERVER blas_server_win32.c)
1820
endif ()

0 commit comments

Comments
 (0)