Skip to content

Commit 3575780

Browse files
committed
Fix whitespace and cmake error
1 parent f0d059c commit 3575780

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

runtime/flang/CMakeLists.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -484,9 +484,9 @@ set_target_properties(flang_static
484484
Fortran_MODULE_DIRECTORY ${CMAKE_BINARY_DIR}/include-static
485485
)
486486
if (MSVC)
487-
set_property(TARGET flang_static PROPERTY OUTPUT_NAME libflang)
487+
set_property(TARGET flang_static PROPERTY OUTPUT_NAME libflang)
488488
else()
489-
set_property(TARGET flang_static PROPERTY OUTPUT_NAME flang)
489+
set_property(TARGET flang_static PROPERTY OUTPUT_NAME flang)
490490
endif()
491491

492492
set(SHARED_LIBRARY TRUE)
@@ -590,30 +590,30 @@ if(NOT ${CMAKE_GENERATOR} STREQUAL "Ninja")
590590
# State a dependency on the module
591591
set_source_files_properties(
592592
${I8_FILES_DIR}/ieee_arithmetic.F95
593-
PROPERTIES
593+
PROPERTIES
594594
COMPILE_DEFINITIONS DESC_I8
595595
OBJECT_DEPENDS ${CMAKE_Fortran_MODULE_DIRECTORY}/iso_c_binding.mod
596596
OBJECT_OUTPUTS ${CMAKE_Fortran_MODULE_DIRECTORY}/ieee_arithmetic_la.mod
597597
)
598598

599599
set_source_files_properties(
600600
${I8_FILES_DIR}/ieee_exceptions.F95
601-
PROPERTIES
601+
PROPERTIES
602602
COMPILE_DEFINITIONS DESC_I8
603603
OBJECT_DEPENDS ${CMAKE_Fortran_MODULE_DIRECTORY}/iso_c_binding.mod
604604
OBJECT_OUTPUTS ${CMAKE_Fortran_MODULE_DIRECTORY}/ieee_exceptions_la.mod
605605
)
606606

607607
set_source_files_properties(
608608
norm2_1.F95
609-
PROPERTIES
609+
PROPERTIES
610610
OBJECT_DEPENDS ${CMAKE_Fortran_MODULE_DIRECTORY}/ieee_arithmetic.mod
611611
OBJECT_DEPENDS ${CMAKE_Fortran_MODULE_DIRECTORY}/ieee_exceptions.mod
612612
)
613613

614614
set_source_files_properties(
615615
${I8_FILES_DIR}/norm2_1.F95
616-
PROPERTIES
616+
PROPERTIES
617617
OBJECT_DEPENDS ${CMAKE_Fortran_MODULE_DIRECTORY}/ieee_arithmetic_la.mod
618618
OBJECT_DEPENDS ${CMAKE_Fortran_MODULE_DIRECTORY}/ieee_exceptions_la.mod
619619
)

runtime/flangrti/CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ SET(ASM_OPTIONS "-DLINUX_ELF")
1111
SET(CMAKE_ASM_FLAGS "${CFLAGS} ${ASM_OPTIONS}" )
1212

1313
if( ${TARGET_ARCHITECTURE} STREQUAL "x86_64" )
14-
set(ARCH_DEP_FILES
14+
set(ARCH_DEP_FILES
1515
x86_64-Linux/x86_daz.c
1616
x86_64-Linux/x86_flushz.c
1717
x86_64-Linux/dumpregs.c
@@ -84,19 +84,19 @@ endif()
8484
# Resolve symbols against libpthread
8585
find_package(Threads REQUIRED)
8686
if (CMAKE_THREAD_LIBS_INIT)
87-
target_link_libraries(flangrti_shared "${CMAKE_THREAD_LIBS_INIT}")
87+
target_link_libraries(flangrti_shared PRIVATE "${CMAKE_THREAD_LIBS_INIT}")
8888
endif()
8989

9090
# Import OpenMP
9191
if (NOT DEFINED LIBOMP_EXPORT_DIR)
92-
find_library(
92+
find_library(
9393
FLANG_LIBOMP
9494
NAMES omp libomp
9595
HINTS ${CMAKE_BINARY_DIR}/lib)
9696
target_link_libraries(flangrti_shared PRIVATE ${FLANG_LIBOMP})
9797
endif()
9898

99-
find_library(
99+
find_library(
100100
LIBPGMATH
101101
NAMES pgmath libpgmath
102102
HINTS ${CMAKE_BINARY_DIR}/lib)

runtime/ompstub/CMakeLists.txt

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

99
add_flang_library(ompstub_static ${OMPSTUB_SRC})
1010
if (MSVC)
11-
set_property(TARGET ompstub_static PROPERTY OUTPUT_NAME libompstub)
11+
set_property(TARGET ompstub_static PROPERTY OUTPUT_NAME libompstub)
1212
else()
13-
set_property(TARGET ompstub_static PROPERTY OUTPUT_NAME ompstub)
13+
set_property(TARGET ompstub_static PROPERTY OUTPUT_NAME ompstub)
1414
endif()
1515

1616
set(SHARED_LIBRARY TRUE)

0 commit comments

Comments
 (0)