[flang] Use the Flang cmake-functions to add targets.

[ChinouneMehdi]

Summary

It also removes the cycle-dependency between FortranSemantics and FortranEvaluate.

[tskeith]

flang/lib/Evaluate/CMakeLists.txt

35

This dependency was added here: https://reviews.llvm.org/rGa1726e65bc1fdbd2800839e48e68cb4a68cc7092
Have you verified that this change doesn't re-introduce the problem that that one was fixing?

[ChinouneMehdi]

flang/lib/Evaluate/CMakeLists.txt

35

I have verified with four configurations ( gcc-8+gold, gcc-9+gold, clang-8+lld and clang-9+lld) on Ubuntu 18.04 x86_64.
I can't be sure because I don't know about his build configuration.

[tskeith]

flang/lib/Evaluate/CMakeLists.txt

35

That sounds good to me.

[sscalpone]

Thanks @ChinouneMehdi

[ChinouneMehdi]

I don't have commit access.
Please, Someone who has commit access commit these changes.

[DavidTruby]

@ChinouneMehdi this looks good to me and I can commit it for you, could you let me know what email address you want used?
Thanks!

[DavidTruby]

flang/lib/Evaluate/CMakeLists.txt

35

I'm not sure why it doesn't reintroduce the linker issue from there, but it doesn't seem to. I'll just double check on the configuration I used there.

[DavidTruby]

flang/lib/Evaluate/CMakeLists.txt

35

Yep, no issue with this patch. Not sure why the issue has gone away, but it should make fixing shared library builds easier!

[ChinouneMehdi]

In D78215#1986519, @DavidTruby wrote:

@ChinouneMehdi this looks good to me and I can commit it for you, could you let me know what email address you want used?
Thanks!

[e-mail]

[ChinouneMehdi]

@DavidTruby
Thanks!

[SouraVX]

flang still can't be build with -DBUILD_SHARED_LIBS=ON, at link time it fails. As of now I see following libraries libFortranDecimal libFortranCommon libFortranLower libLLVMDemangle and libLLVMSupport are getting building fine. I suspect there is some circular dependency between libFortranParser libFortranSemantics and libFortranEvaluate ?
Static build's are fine.

[ChinouneMehdi]

In D78215#1991289, @SouraVX wrote:

flang still can't be build with -DBUILD_SHARED_LIBS=ON, at link time it fails. As of now I see following libraries libFortranDecimal libFortranCommon libFortranLower libLLVMDemangle and libLLVMSupport are getting building fine. I suspect there is some circular dependency between libFortranParser libFortranSemantics and libFortranEvaluate ?
Static build's are fine.

It's a known issue, there is a circular dependency between FortranEvaluate and FortranParser.

[tskeith]

It's a known issue, there is a circular dependency between FortranEvaluate and FortranParser.

The circular dependency is between FortranEvaluate and FortranSemantics.

flang/cmake/modules/AddFlang.cmake

 endmacro(add_flang_executable)
 
 macro(add_flang_tool name)
   if (NOT FLANG_BUILD_TOOLS)
     set(EXCLUDE_FROM_ALL ON)
   endif()
 
   add_flang_executable(${name} ${ARGN})
-  add_dependencies(${name} flang-resource-headers)
 
   if (FLANG_BUILD_TOOLS)
     set(export_to_flangtargets)
     if (${name} IN_LIST LLVM_DISTRIBUTION_COMPONENTS OR
         NOT LLVM_DISTRIBUTION_COMPONENTS)
       set(export_to_flangtargets EXPORT FlangTargets)
       set_property(GLOBAL PROPERTY FLANG_HAS_EXPORTS True)
     endif()

flang/lib/Common/CMakeLists.txt

 
-add_library(FortranCommon
+add_flang_library(FortranCommon
   Fortran.cpp
   Fortran-features.cpp
   default-kinds.cpp
   idioms.cpp
-)
-
-target_compile_features(FortranCommon PUBLIC cxx_std_17)
 
-install (TARGETS FortranCommon
-  ARCHIVE DESTINATION lib
-  LIBRARY DESTINATION lib
-  RUNTIME DESTINATION bin
+  LINK_COMPONENTS
+  Support
 )

flang/lib/Decimal/CMakeLists.txt

 
-add_library(FortranDecimal
+add_flang_library(FortranDecimal
   binary-to-decimal.cpp
   decimal-to-binary.cpp
 )
-
-target_compile_features(FortranDecimal PUBLIC cxx_std_17)
-
-install (TARGETS FortranDecimal
-  ARCHIVE DESTINATION lib
-  LIBRARY DESTINATION lib
-  RUNTIME DESTINATION bin
-)

flang/lib/Evaluate/CMakeLists.txt

 
-add_library(FortranEvaluate
+add_flang_library(FortranEvaluate
   call.cpp
   characteristics.cpp
   check-expression.cpp
   common.cpp
   complex.cpp
   constant.cpp
   expression.cpp
   fold.cpp
add_flang_library(FortranEvaluate
   intrinsics-library.cpp
   logical.cpp
   real.cpp
   shape.cpp
   static-data.cpp
   tools.cpp
   type.cpp
   variable.cpp
-)
-
-target_compile_features(FortranEvaluate PUBLIC cxx_std_17)
 
-target_link_libraries(FortranEvaluate
+  LINK_LIBS
   FortranCommon
   FortranDecimal
-  FortranSemantics
   FortranParser
 )
 
-install (TARGETS FortranEvaluate
-  ARCHIVE DESTINATION lib
-  LIBRARY DESTINATION lib
-  RUNTIME DESTINATION bin
-)
-
 if (LIBPGMATH_DIR)
   # If pgmath library is found, it can be used for constant folding.
   find_library(LIBPGMATH pgmath PATHS ${LIBPGMATH_DIR})
   if(LIBPGMATH)
     add_compile_definitions(LINK_WITH_LIBPGMATH)
     target_link_libraries(FortranEvaluate ${LIBPGMATH})
     message(STATUS "Found libpgmath: ${LIBPGMATH}")
   else()
     message(STATUS "Libpgmath not found in: ${LIBPGMATH_DIR}")
   endif()
 endif()

flang/lib/Lower/CMakeLists.txt

-add_library(FortranLower
-  PFTBuilder.cpp
-)
 
-target_link_libraries(FortranLower
-  LLVMSupport
-)
+add_flang_library(FortranLower
+  PFTBuilder.cpp
 
-install (TARGETS FortranLower
-  ARCHIVE DESTINATION lib
-  LIBRARY DESTINATION lib
-  RUNTIME DESTINATION bin
+  LINK_COMPONENTS
+  Support
 )

flang/lib/Optimizer/Dialect/CMakeLists.txt

-add_llvm_library(FIRDialect
+add_flang_library(FIRDialect
   FIRAttr.cpp
   FIRDialect.cpp
   FIROps.cpp
   FIRType.cpp
-)
 
-add_dependencies(FIRDialect FIROpsIncGen)
+  DEPENDS
+  FIROpsIncGen
 
-target_link_libraries(FIRDialect
+  LINK_LIBS
+  FIRSupport
   MLIRTargetLLVMIR
   MLIRTargetLLVMIRModuleTranslation
   MLIREDSC
   MLIRExecutionEngine
   MLIRParser
   MLIRSupport
   MLIRStandardToLLVM
   MLIRTransforms
-  LLVMAsmParser
-  LLVMAsmPrinter
-  LLVMRemarks
-)
 
-install (TARGETS FIRDialect
-  ARCHIVE DESTINATION lib
-  LIBRARY DESTINATION lib
+  LINK_COMPONENTS
+  AsmParser
+  AsmPrinter
+  Remarks
 )

flang/lib/Optimizer/Support/CMakeLists.txt

-add_llvm_library(FIRSupport
-  KindMapping.cpp
-)
+get_property(dialect_libs GLOBAL PROPERTY MLIR_DIALECT_LIBS)
 
-target_link_libraries(FIRSupport FIRDialect)
+add_flang_library(FIRSupport
+  KindMapping.cpp
 
-install (TARGETS FIRSupport
-  ARCHIVE DESTINATION lib
-  LIBRARY DESTINATION lib
+  LINK_LIBS
+  ${dialect_libs}
 )

flang/lib/Parser/CMakeLists.txt

 
-add_library(FortranParser
+add_flang_library(FortranParser
   Fortran-parsers.cpp
   char-buffer.cpp
   char-block.cpp
   char-set.cpp
   characters.cpp
   debug-parser.cpp
   executable-parsers.cpp
   expr-parsers.cpp
   instrumented-parser.cpp
   io-parsers.cpp
   message.cpp
   openmp-parsers.cpp
   parse-tree.cpp
   parsing.cpp
   preprocessor.cpp
   prescan.cpp
   program-parsers.cpp
   provenance.cpp
   source.cpp
   token-sequence.cpp
   tools.cpp
   unparse.cpp
   user-state.cpp
-)
-
-target_compile_features(FortranParser PRIVATE cxx_std_17)
 
-target_link_libraries(FortranParser
+  LINK_LIBS
   FortranCommon
-  LLVMSupport
-)
 
-install (TARGETS FortranParser
-  ARCHIVE DESTINATION lib
-  LIBRARY DESTINATION lib
-  RUNTIME DESTINATION bin
+  LINK_COMPONENTS
+  Support
 )

flang/lib/Semantics/CMakeLists.txt

 
-add_library(FortranSemantics
+add_flang_library(FortranSemantics
   assignment.cpp
   attr.cpp
   canonicalize-do.cpp
   canonicalize-omp.cpp
   check-allocate.cpp
   check-arithmeticif.cpp
   check-call.cpp
   check-case.cpp
add_flang_library(FortranSemantics
   resolve-names-utils.cpp
   rewrite-parse-tree.cpp
   scope.cpp
   semantics.cpp
   symbol.cpp
   tools.cpp
   type.cpp
   unparse-with-symbols.cpp
-)
-
-target_compile_features(FortranSemantics PUBLIC cxx_std_17)
 
-target_link_libraries(FortranSemantics
+  LINK_LIBS
   FortranCommon
   FortranEvaluate
-  LLVMSupport
-)
 
-install (TARGETS FortranSemantics
-  ARCHIVE DESTINATION lib
-  LIBRARY DESTINATION lib
-  RUNTIME DESTINATION bin
+  LINK_COMPONENTS
+  Support
 )

flang/runtime/CMakeLists.txt

check_cxx_source_compiles(
   HAVE_DECL_STRERROR_S)
 
 if (NOT (HAVE_STRERROR OR HAVE_STRERROR_R OR HAVE_DECL_STRERROR_S))
   message(FATAL_ERROR "None of strerror, strerror_r, strerror_s found.")
 endif()
 
 configure_file(config.h.cmake config.h)
 
-add_library(FortranRuntime
+add_flang_library(FortranRuntime
   ISO_Fortran_binding.cpp
   allocatable.cpp
   buffer.cpp
   character.cpp
   connection.cpp
   derived-type.cpp
   descriptor.cpp
   edit-input.cpp
add_flang_library(FortranRuntime
   memory.cpp
   stop.cpp
   terminator.cpp
   tools.cpp
   transformational.cpp
   type-code.cpp
   unit.cpp
   unit-map.cpp
-)
-
-target_include_directories(FortranRuntime
-  PRIVATE ${CMAKE_CURRENT_BINARY_DIR}
-)
 
-target_link_libraries(FortranRuntime
+  LINK_LIBS
   FortranDecimal
 )

flang/tools/f18-parse-demo/CMakeLists.txt

-add_llvm_tool(f18-parse-demo
+add_flang_tool(f18-parse-demo
   f18-parse-demo.cpp
   stub-evaluate.cpp
-  )
-set_property(TARGET f18-parse-demo PROPERTY CXX_STANDARD 17)
-target_compile_features(f18-parse-demo PRIVATE cxx_std_17)
 
 target_link_libraries(f18-parse-demo
   PRIVATE
   FortranParser
   )
-
-#install(TARGETS f18-parse-demo DESTINATION bin)

flang/tools/f18/CMakeLists.txt

-add_llvm_tool(f18
+add_flang_tool(f18
   dump.cpp
   f18.cpp
 )
-set_property(TARGET f18 PROPERTY CXX_STANDARD 17)
-target_compile_features(f18 PRIVATE cxx_std_17)
 
 target_link_libraries(f18
   PRIVATE
   FortranParser
   FortranEvaluate
   FortranSemantics
   FortranLower
   LLVMSupport

flang/tools/tco/CMakeLists.txt

set(LIBS
   MLIRLoopToStandard
   MLIREDSC
   MLIRParser
   MLIRStandardToLLVM
   MLIRSupport
   MLIRVectorToLLVM
 )
 
-add_llvm_tool(tco tco.cpp)
-llvm_update_compile_flags(tco)
+add_flang_tool(tco tco.cpp)
 target_link_libraries(tco PRIVATE ${LIBS})