alexey.zholtikov/upm
1
0
Fork 0
mirror of https://github.com/eclipse/upm.git synced 2025-10-30 06:34:58 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

src/CMakeLists.txt: add upm utilities as a link dependency for C libs

Browse Source 
Make sure that for all C libs, upmc-utilities is linked in.  Also, do
not do this for the utilities library itself.

In addition, do not add the utilities library as a requirement for the
libupmc-utilities pkgconfig file.

Signed-off-by: Jon Trulson <jtrulson@ics.com>
This commit is contained in:
Jon Trulson
2016-08-24 15:40:30 -06:00
committed by Noel Eck
parent 64e81def0f
commit 3cb80093e0
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/CMakeLists.txt
View File

@@ -248,8 +248,10 @@ function (UPM_MIXED_MODULE_INIT)
# Create the reqlibname list # Create the reqlibname list
string(REPLACE ";" " " reqlibname "${UPM_MIXED_MODULE_INIT_REQUIRES}") string(REPLACE ";" " " reqlibname "${UPM_MIXED_MODULE_INIT_REQUIRES}")
# Append upm-utilities to the reqlibs # Append upmc-utilities to the reqlibs (but not on upm-utilities itself)
set (reqlibname "${reqlibname} upm-utilities") if (NOT ${libname} MATCHES "utilities")
set (reqlibname "${reqlibname} upmc-utilities")
endif()
# If building FTI, and FTI src exists, add it in # If building FTI, and FTI src exists, add it in
if (BUILDFTI AND UPM_MIXED_MODULE_INIT_FTI_SRC) if (BUILDFTI AND UPM_MIXED_MODULE_INIT_FTI_SRC)
@@ -266,7 +268,13 @@ function (UPM_MIXED_MODULE_INIT)
# Set a flag to tell upm_module_init that it's building a C library # Set a flag to tell upm_module_init that it's building a C library
set (IS_C_LIBRARY TRUE) set (IS_C_LIBRARY TRUE)
upm_module_init() upm_module_init()
endif (UPM_MIXED_MODULE_INIT_C_SRC)
# add upmc-utilities as a dependancy to all C libs (but NOT to the
# utilities lib itself)
if (NOT ${libname} MATCHES "utilities-c")
target_link_libraries (${libname} upmc-utilities)
endif()
endif (UPM_MIXED_MODULE_INIT_C_SRC)
# Build C++ if enabled AND C++ headers exist # Build C++ if enabled AND C++ headers exist
if (BUILDCPP AND UPM_MIXED_MODULE_INIT_CPP_HDR) if (BUILDCPP AND UPM_MIXED_MODULE_INIT_CPP_HDR)