[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
This commit is contained in:
Slava Zakharin 2023-08-01 09:50:44 -07:00
parent 59237bb52c
commit 6d0d4113df
4 changed files with 5 additions and 21 deletions

View File

@ -1,3 +1,5 @@
include(CheckLibraryExists)
if (LIBPGMATH_DIR)
# If pgmath library is found, it can be used for constant folding.
find_library(LIBPGMATH pgmath PATHS ${LIBPGMATH_DIR})
@ -23,6 +25,7 @@ check_include_file(quadmath.h FOUND_QUADMATH_HEADER)
check_library_exists(quadmath sinq "" FOUND_QUADMATH_LIB)
if(FOUND_QUADMATH_HEADER AND FOUND_QUADMATH_LIB)
add_compile_definitions(HAS_QUADMATHLIB)
set(QUADMATHLIB quadmath)
endif()
add_flang_library(FortranEvaluate
@ -61,6 +64,7 @@ add_flang_library(FortranEvaluate
FortranDecimal
FortranParser
${LIBPGMATH}
${QUADMATHLIB}
LINK_COMPONENTS
Support

View File

@ -1,12 +1,6 @@
get_property(dialect_libs GLOBAL PROPERTY MLIR_DIALECT_LIBS)
get_property(extension_libs GLOBAL PROPERTY MLIR_EXTENSION_LIBS)
check_include_file(quadmath.h FOUND_QUADMATH_HEADER)
check_library_exists(quadmath sinq "" FOUND_QUADMATH_LIB)
if(FOUND_QUADMATH_HEADER AND FOUND_QUADMATH_LIB)
set(QUADMATHLIB quadmath)
endif()
add_flang_library(flangFrontend
CompilerInstance.cpp
CompilerInvocation.cpp
@ -48,7 +42,6 @@ add_flang_library(flangFrontend
MLIRTargetLLVMIRImport
${dialect_libs}
${extension_libs}
${QUADMATHLIB}
LINK_COMPONENTS
Passes

View File

@ -12,12 +12,6 @@ llvm_update_compile_flags(bbc)
get_property(dialect_libs GLOBAL PROPERTY MLIR_DIALECT_LIBS)
get_property(extension_libs GLOBAL PROPERTY MLIR_EXTENSION_LIBS)
check_include_file(quadmath.h FOUND_QUADMATH_HEADER)
check_library_exists(quadmath sinq "" FOUND_QUADMATH_LIB)
if(FOUND_QUADMATH_HEADER AND FOUND_QUADMATH_LIB)
set(QUADMATHLIB quadmath)
endif()
target_link_libraries(bbc PRIVATE
FIRDialect
FIRDialectSupport
@ -35,5 +29,4 @@ FortranParser
FortranEvaluate
FortranSemantics
FortranLower
${QUADMATHLIB}
)

View File

@ -9,14 +9,8 @@ else()
llvm_map_components_to_libnames(llvm_libs Support)
endif()
check_include_file(quadmath.h FOUND_QUADMATH_HEADER)
check_library_exists(quadmath sinq "" FOUND_QUADMATH_LIB)
if(FOUND_QUADMATH_HEADER AND FOUND_QUADMATH_LIB)
set(QUADMATHLIB quadmath)
endif()
target_link_libraries(FortranEvaluateTesting
${llvm_libs} ${QUADMATHLIB})
${llvm_libs})
add_flang_nongtest_unittest(leading-zero-bit-count
FortranEvaluateTesting