[flang] Fixed out-of-tree build after D156435.

[vzakhari]

Summary

I decided to clean up the CMake files as well.
Only FotranEvaluate directly needs quadmath, so we only need
to link these two together.

[PeteSteinfeld]

Thanks for cleaning this up, Slava.

All builds and tests correctly and looks good.

[Renaud-K]

flang/lib/Evaluate/CMakeLists.txt

25

Can we request a static library only.

[vzakhari]

flang/lib/Evaluate/CMakeLists.txt

25

Sounds reasonable to me. I will make it in a separate commit. Thank you!

flang/lib/Evaluate/CMakeLists.txt

+include(CheckLibraryExists)
+
 if (LIBPGMATH_DIR)
   # If pgmath library is found, it can be used for constant folding.
   find_library(LIBPGMATH pgmath PATHS ${LIBPGMATH_DIR})
   if(LIBPGMATH)
     # pgmath uses _Complex, so only enable linking pgmath with flang in environments
     # that support it (MSVC is OK, pgmath uses _Fcomplex/_Dcomplex there).
     if (CMAKE_CXX_COMPILER_ID MATCHES "Clang|GNU|MSVC")
       check_cxx_compiler_flag("-Werror -Wc99-extensions" HAS_WC99_EXTENSIONS_FLAG)
       if (HAS_WC99_EXTENSIONS_FLAG)
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-c99-extensions")
       endif()
       add_compile_definitions(LINK_WITH_LIBPGMATH)
       message(STATUS "Found libpgmath: ${LIBPGMATH}")
     else()
       message(STATUS "Libpgmath will not be used because C99 complex is not supported.")
     endif()
   else()
     message(STATUS "Libpgmath not found in: ${LIBPGMATH_DIR}")
   endif()
 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)
   add_compile_definitions(HAS_QUADMATHLIB)
+  set(QUADMATHLIB quadmath)
 endif()
 
 add_flang_library(FortranEvaluate
   call.cpp
   characteristics.cpp
   check-expression.cpp
   common.cpp
   complex.cpp
add_flang_library(FortranEvaluate
   type.cpp
   variable.cpp
 
   LINK_LIBS
   FortranCommon
   FortranDecimal
   FortranParser
   ${LIBPGMATH}
+  ${QUADMATHLIB}
 
   LINK_COMPONENTS
   Support
 
   DEPENDS
   acc_gen
   omp_gen
 )

flang/lib/Frontend/CMakeLists.txt

 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
   CodeGenOptions.cpp
   FrontendAction.cpp
   FrontendActions.cpp
   FrontendOptions.cpp
   LangOptions.cpp
add_flang_library(flangFrontend
   HLFIRTransforms
   MLIRTransforms
   MLIRBuiltinToLLVMIRTranslation
   MLIRLLVMToLLVMIRTranslation
   MLIRSCFToControlFlow
   MLIRTargetLLVMIRImport
   ${dialect_libs}
   ${extension_libs}
-  ${QUADMATHLIB}
 
   LINK_COMPONENTS
   Passes
   Analysis
   Extensions
   IRReader
   Option
   Support

flang/tools/bbc/CMakeLists.txt

 set(LLVM_LINK_COMPONENTS
 Passes
 TargetParser
 )
 
 add_flang_tool(bbc bbc.cpp
 DEPENDS
 FIROptCodeGenPassIncGen
 )
 
 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
 FIRSupport
 FIRTransforms
 FIRBuilder
 HLFIRDialect
 HLFIRTransforms
 ${dialect_libs}
 ${extension_libs}
 MLIRAffineToStandard
 MLIRSCFToControlFlow
 FortranCommon
 FortranParser
 FortranEvaluate
 FortranSemantics
 FortranLower
-${QUADMATHLIB}
 )

flang/unittests/Evaluate/CMakeLists.txt

 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
 add_library(FortranEvaluateTesting
   testing.cpp
   fp-testing.cpp
 )
 if (LLVM_LINK_LLVM_DYLIB)
   set(llvm_libs LLVM)
 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
 )
 
 add_flang_nongtest_unittest(bit-population-count
   FortranEvaluateTesting
 )