Skip to content

Commit 0ce185d

Browse files
committed
Use WIN32 instead of MSVC in CMake files
In general we could use clang compiler with regular front end on Windows which is detected as GNU compiler not MSVC. In this case it is better to check the platform itself in CMake.
1 parent 0b96ff2 commit 0ce185d

File tree

5 files changed

+13
-15
lines changed

5 files changed

+13
-15
lines changed

runtime/flang/CMakeLists.txt

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ enable_language(C ASM Fortran) # Enable assembly and Fortran
88

99
SET(ASM_OPTIONS "-DLINUX_ELF")
1010
SET(CMAKE_ASM_FLAGS "${CFLAGS} ${ASM_OPTIONS}" )
11-
if (NOT MSVC)
11+
if (NOT WIN32)
1212
SET(CMAKE_SHARED_LINKER_FLAGS "-no-flang-libs")
1313
else ()
1414
SET(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -no-flang-libs")
@@ -483,8 +483,8 @@ set_target_properties(flang_static
483483
PROPERTIES
484484
Fortran_MODULE_DIRECTORY ${CMAKE_BINARY_DIR}/include-static
485485
)
486-
if (MSVC)
487-
set_property(TARGET flang_static PROPERTY OUTPUT_NAME libflang)
486+
if (WIN32)
487+
set_property(TARGET flang_static PROPERTY OUTPUT_NAME flang_static)
488488
else()
489489
set_property(TARGET flang_static PROPERTY OUTPUT_NAME flang)
490490
endif()
@@ -502,10 +502,8 @@ add_flang_library(flang_shared
502502
set_property(TARGET flang_shared PROPERTY OUTPUT_NAME flang)
503503
target_link_libraries(flang_shared flangrti_shared)
504504
# Resolve symbols against libm and librt
505-
if (NOT MSVC)
506-
target_link_libraries(flang_shared m rt)
507-
else()
508-
set_target_properties(flang_shared PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS TRUE)
505+
if (NOT WIN32)
506+
target_link_libraries(flang_shared m rt)
509507
endif()
510508

511509
set(SHARED_LIBRARY FALSE)
@@ -645,7 +643,7 @@ add_dependencies(flang_shared
645643
flang2
646644
)
647645

648-
if (NOT MSVC)
646+
if (NOT WIN32)
649647
target_compile_options(flang_static PRIVATE -fPIC)
650648
target_compile_options(flang_shared PRIVATE -fPIC)
651649
else()

runtime/flangrti/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ add_flang_library(flangrti_static
6767
${PGC_SRC_FILES}
6868
${SHARED_SOURCES}
6969
)
70-
if (MSVC)
70+
if (WIN32)
7171
set_property(TARGET flangrti_static PROPERTY OUTPUT_NAME libflangrti)
7272
else()
7373
set_property(TARGET flangrti_static PROPERTY OUTPUT_NAME flangrti)
@@ -81,7 +81,7 @@ add_flang_library(flangrti_shared
8181
)
8282

8383
# Resolve symbols against libm
84-
if (NOT MSVC)
84+
if (NOT WIN32)
8585
target_link_libraries(flangrti_shared PRIVATE m)
8686
endif()
8787

@@ -125,7 +125,7 @@ target_include_directories(flangrti_shared
125125
set_target_properties(flangrti_shared flangrti_static
126126
PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${FLANG_RTE_LIB_DIR})
127127

128-
if (NOT MSVC)
128+
if (NOT WIN32)
129129
target_compile_options(flangrti_static PRIVATE -fPIC)
130130
target_compile_options(flangrti_shared PRIVATE -fPIC)
131131
else()

runtime/ompstub/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
set(OMPSTUB_SRC init_nomp.c ompstubs.c)
88

99
add_flang_library(ompstub_static ${OMPSTUB_SRC})
10-
if (MSVC)
10+
if (WIN32)
1111
set_property(TARGET ompstub_static PROPERTY OUTPUT_NAME libompstub)
1212
else()
1313
set_property(TARGET ompstub_static PROPERTY OUTPUT_NAME ompstub)
@@ -16,7 +16,7 @@ endif()
1616
set(SHARED_LIBRARY TRUE)
1717
add_flang_library(ompstub_shared ${OMPSTUB_SRC})
1818
set_property(TARGET ompstub_shared PROPERTY OUTPUT_NAME ompstub)
19-
if (MSVC)
19+
if (WIN32)
2020
set_target_properties(ompstub_shared PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS TRUE)
2121
endif()
2222
set(SHARED_LIBRARY FALSE)

tools/flang1/flang1exe/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ target_link_libraries(flang1
158158
scutil
159159
)
160160

161-
if (NOT MSVC)
161+
if (NOT WIN32)
162162
target_link_libraries(flang1 PRIVATE m)
163163
endif()
164164

tools/flang2/flang2exe/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ target_link_libraries(flang2
138138
scutil
139139
)
140140

141-
if (NOT MSVC)
141+
if (NOT WIN32)
142142
target_link_libraries(flang2 PRIVATE m)
143143
endif()
144144

0 commit comments

Comments
 (0)