Changeset 965cc7b7 in OpenModelica


Ignore:
Timestamp:
2020-10-21T14:04:17+02:00 (3 years ago)
Author:
Mahder Gebremedhin <mahder.gebremedhin@…>
Children:
c4208ad
Parents:
780c1e84
git-author:
Mahder Gebremedhin <mahder.gebremedhin@…> (09/16/20 14:54:01)
git-committer:
Mahder Gebremedhin <mahder.gebremedhin@…> (10/21/20 14:04:17)
Message:

[cmake] Change Intl linkage approach.

  • libintl can be part of GNU libc in Linux. Then a linking command like "-lintl" would not work since there is no intl.
  • So instead use the old cmake way specifying ${INTL_LIBRARIES} which can be just empty.
  • Until we get a namespaced version like Intl::Intl that can be empty when libintl does not exist we can be happy with this.
Location:
OMCompiler
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • OMCompiler/Compiler/runtime/CMakeLists.txt

    r780c1e84 r965cc7b7  
    5454
    5555target_link_libraries(omcruntime PUBLIC curl)
    56 target_link_libraries(omcruntime PUBLIC Intl)
     56target_link_libraries(omcruntime PUBLIC ${Intl_LIBRARIES})
    5757target_link_libraries(omcruntime PUBLIC Iconv::Iconv)
    5858target_link_libraries(omcruntime PUBLIC ${LAPACK_LIBRARIES})
     
    8484add_library(omc::compiler::backendruntime ALIAS omcbackendruntime)
    8585
    86 target_link_libraries(omcbackendruntime PUBLIC Intl)
     86target_link_libraries(omcbackendruntime PUBLIC ${Intl_LIBRARIES})
    8787target_link_libraries(omcbackendruntime PUBLIC OpenModelicaRuntimeC)
    8888target_link_libraries(omcbackendruntime PUBLIC omc::3rd::fmilib::static)
  • OMCompiler/Parser/CMakeLists.txt

    rb5b95099 r965cc7b7  
    3535add_library(omparse STATIC ${OM_PARSE_SOURCES})
    3636add_library(omc::parser ALIAS omparse)
    37 target_link_libraries(omparse PUBLIC Intl)
     37target_link_libraries(omparse PUBLIC ${Intl_LIBRARIES})
    3838target_link_libraries(omparse PUBLIC omc::compiler::runtime)
    3939target_link_libraries(omparse PUBLIC omc::3rd::omantlr3)
Note: See TracChangeset for help on using the changeset viewer.