diff --git a/flang/lib/Evaluate/CMakeLists.txt b/flang/lib/Evaluate/CMakeLists.txt --- a/flang/lib/Evaluate/CMakeLists.txt +++ b/flang/lib/Evaluate/CMakeLists.txt @@ -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_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 @@ FortranDecimal FortranParser ${LIBPGMATH} + ${QUADMATHLIB} LINK_COMPONENTS Support diff --git a/flang/lib/Frontend/CMakeLists.txt b/flang/lib/Frontend/CMakeLists.txt --- a/flang/lib/Frontend/CMakeLists.txt +++ b/flang/lib/Frontend/CMakeLists.txt @@ -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 @@ MLIRTargetLLVMIRImport ${dialect_libs} ${extension_libs} - ${QUADMATHLIB} LINK_COMPONENTS Passes diff --git a/flang/tools/bbc/CMakeLists.txt b/flang/tools/bbc/CMakeLists.txt --- a/flang/tools/bbc/CMakeLists.txt +++ b/flang/tools/bbc/CMakeLists.txt @@ -12,12 +12,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() - target_link_libraries(bbc PRIVATE FIRDialect FIRDialectSupport @@ -35,5 +29,4 @@ FortranEvaluate FortranSemantics FortranLower -${QUADMATHLIB} ) diff --git a/flang/unittests/Evaluate/CMakeLists.txt b/flang/unittests/Evaluate/CMakeLists.txt --- a/flang/unittests/Evaluate/CMakeLists.txt +++ b/flang/unittests/Evaluate/CMakeLists.txt @@ -9,14 +9,8 @@ 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