Skip to content

Commit 6d0d411

Browse files
committed
[flang] Fixed out-of-tree build after D156435.
I decided to clean up the CMake files as well. Only FotranEvaluate directly needs quadmath, so we only need to link these two together. Differential Revision: https://reviews.llvm.org/D156808
1 parent 59237bb commit 6d0d411

File tree

4 files changed

+5
-21
lines changed

4 files changed

+5
-21
lines changed

flang/lib/Evaluate/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
include(CheckLibraryExists)
2+
13
if (LIBPGMATH_DIR)
24
# If pgmath library is found, it can be used for constant folding.
35
find_library(LIBPGMATH pgmath PATHS ${LIBPGMATH_DIR})
@@ -23,6 +25,7 @@ check_include_file(quadmath.h FOUND_QUADMATH_HEADER)
2325
check_library_exists(quadmath sinq "" FOUND_QUADMATH_LIB)
2426
if(FOUND_QUADMATH_HEADER AND FOUND_QUADMATH_LIB)
2527
add_compile_definitions(HAS_QUADMATHLIB)
28+
set(QUADMATHLIB quadmath)
2629
endif()
2730

2831
add_flang_library(FortranEvaluate
@@ -61,6 +64,7 @@ add_flang_library(FortranEvaluate
6164
FortranDecimal
6265
FortranParser
6366
${LIBPGMATH}
67+
${QUADMATHLIB}
6468

6569
LINK_COMPONENTS
6670
Support

flang/lib/Frontend/CMakeLists.txt

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
11
get_property(dialect_libs GLOBAL PROPERTY MLIR_DIALECT_LIBS)
22
get_property(extension_libs GLOBAL PROPERTY MLIR_EXTENSION_LIBS)
33

4-
check_include_file(quadmath.h FOUND_QUADMATH_HEADER)
5-
check_library_exists(quadmath sinq "" FOUND_QUADMATH_LIB)
6-
if(FOUND_QUADMATH_HEADER AND FOUND_QUADMATH_LIB)
7-
set(QUADMATHLIB quadmath)
8-
endif()
9-
104
add_flang_library(flangFrontend
115
CompilerInstance.cpp
126
CompilerInvocation.cpp
@@ -48,7 +42,6 @@ add_flang_library(flangFrontend
4842
MLIRTargetLLVMIRImport
4943
${dialect_libs}
5044
${extension_libs}
51-
${QUADMATHLIB}
5245

5346
LINK_COMPONENTS
5447
Passes

flang/tools/bbc/CMakeLists.txt

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,6 @@ llvm_update_compile_flags(bbc)
1212
get_property(dialect_libs GLOBAL PROPERTY MLIR_DIALECT_LIBS)
1313
get_property(extension_libs GLOBAL PROPERTY MLIR_EXTENSION_LIBS)
1414

15-
check_include_file(quadmath.h FOUND_QUADMATH_HEADER)
16-
check_library_exists(quadmath sinq "" FOUND_QUADMATH_LIB)
17-
if(FOUND_QUADMATH_HEADER AND FOUND_QUADMATH_LIB)
18-
set(QUADMATHLIB quadmath)
19-
endif()
20-
2115
target_link_libraries(bbc PRIVATE
2216
FIRDialect
2317
FIRDialectSupport
@@ -35,5 +29,4 @@ FortranParser
3529
FortranEvaluate
3630
FortranSemantics
3731
FortranLower
38-
${QUADMATHLIB}
3932
)

flang/unittests/Evaluate/CMakeLists.txt

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,8 @@ else()
99
llvm_map_components_to_libnames(llvm_libs Support)
1010
endif()
1111

12-
check_include_file(quadmath.h FOUND_QUADMATH_HEADER)
13-
check_library_exists(quadmath sinq "" FOUND_QUADMATH_LIB)
14-
if(FOUND_QUADMATH_HEADER AND FOUND_QUADMATH_LIB)
15-
set(QUADMATHLIB quadmath)
16-
endif()
17-
1812
target_link_libraries(FortranEvaluateTesting
19-
${llvm_libs} ${QUADMATHLIB})
13+
${llvm_libs})
2014

2115
add_flang_nongtest_unittest(leading-zero-bit-count
2216
FortranEvaluateTesting

0 commit comments

Comments
 (0)