File tree Expand file tree Collapse file tree 5 files changed +13
-15
lines changed Expand file tree Collapse file tree 5 files changed +13
-15
lines changed Original file line number Diff line number Diff line change @@ -8,7 +8,7 @@ enable_language(C ASM Fortran) # Enable assembly and Fortran
88
99SET (ASM_OPTIONS "-DLINUX_ELF" )
1010SET (CMAKE_ASM_FLAGS "${CFLAGS} ${ASM_OPTIONS} " )
11- if (NOT MSVC )
11+ if (NOT WIN32 )
1212 SET (CMAKE_SHARED_LINKER_FLAGS "-no-flang-libs" )
1313else ()
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 )
488488else ()
489489set_property (TARGET flang_static PROPERTY OUTPUT_NAME flang)
490490endif ()
@@ -502,10 +502,8 @@ add_flang_library(flang_shared
502502set_property (TARGET flang_shared PROPERTY OUTPUT_NAME flang)
503503target_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)
509507endif ()
510508
511509set (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)
651649else ()
Original file line number Diff line number Diff 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)
7272else ()
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)
8686endif ()
8787
@@ -125,7 +125,7 @@ target_include_directories(flangrti_shared
125125set_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)
131131else ()
Original file line number Diff line number Diff line change 77set (OMPSTUB_SRC init_nomp.c ompstubs.c)
88
99add_flang_library(ompstub_static ${OMPSTUB_SRC} )
10- if (MSVC )
10+ if (WIN32 )
1111set_property (TARGET ompstub_static PROPERTY OUTPUT_NAME libompstub)
1212else ()
1313set_property (TARGET ompstub_static PROPERTY OUTPUT_NAME ompstub)
@@ -16,7 +16,7 @@ endif()
1616set (SHARED_LIBRARY TRUE )
1717add_flang_library(ompstub_shared ${OMPSTUB_SRC} )
1818set_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 )
2121endif ()
2222set (SHARED_LIBRARY FALSE )
Original file line number Diff line number Diff 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)
163163endif ()
164164
Original file line number Diff line number Diff 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)
143143endif ()
144144
You can’t perform that action at this time.
0 commit comments