alexey.zholtikov/upm
1
0
Fork 0
mirror of https://github.com/eclipse/upm.git synced 2025-03-24 09:20:39 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

cmake: Convert module_init to function

Browse Source 
This is a housekeeping commit to move the upm_module_init
macro to a function.  The scope resolution of the function
call adds a bit more protection for the variables used inside
this macro/function.

Signed-off-by: Noel Eck <noel.eck@intel.com>
This commit is contained in:
Noel Eck 2017-01-27 15:06:44 -08:00
parent 08a46ee8e6
commit 7f0e03b0e3
1 changed files with 14 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/CMakeLists.txt
View File

@ -37,33 +37,13 @@ macro (upm_create_install_pkgconfig generated_file install_location)
install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${generated_file} DESTINATION ${install_location}) install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${generated_file} DESTINATION ${install_location})
endmacro(upm_create_install_pkgconfig) endmacro(upm_create_install_pkgconfig)
# Provides a means to call target_link_libraries AND the necessary # Provide a wrapper to call target_link_libraries AND add any additional
# swig_link_libaries. This iterates over all additional parameters AFTER # functionality necessary for upm modules. This was being used to add
# the target name calling target_link_libraries/swig_link_libraries # link dependencies for the swig wrappers (swig_link_libraries). This has
# as necessary accordingly # been removed. Leaving the wrapper call to minimize changes.
macro (upm_target_link_libraries target_name) macro (upm_target_link_libraries target_name)
# For each additional argument to upm_target_link_libraries... # Add the dependencies
foreach(_library ${ARGN}) target_link_libraries(${target_name} ${ARGN})
# Add the dependency
target_link_libraries(${target_name} ${_library})
# Call the swig link library method for each library
if (BUILDSWIGNODE)
swig_link_libraries (jsupm_${libname} ${_library})
endif()
# Build python2 AND/OR python3 modules
if (BUILDSWIGPYTHON)
if (PYTHON2LIBS_FOUND)
swig_link_libraries (pyupm_${libname}-python2 ${_library})
endif (PYTHON2LIBS_FOUND)
if (PYTHON3LIBS_FOUND)
swig_link_libraries (pyupm_${libname}-python3 ${_library})
endif (PYTHON3LIBS_FOUND)
endif()
if (BUILDSWIGJAVA)
swig_link_libraries (javaupm_${libname} ${_library})
endif()
endforeach(_library ${ARGN})
endmacro (upm_target_link_libraries target_name) endmacro (upm_target_link_libraries target_name)
# Create a single swig target for python # Create a single swig target for python
@ -398,6 +378,9 @@ function (UPM_MIXED_MODULE_INIT)
# C_SRC -> List of C source files # C_SRC -> List of C source files
# FTI_SRC -> List of C FTI source files # FTI_SRC -> List of C FTI source files
# REQUIRES -> List requires libraries for pkg-config # REQUIRES -> List requires libraries for pkg-config
# Exports to PARENT scope:
# libname -> CXX target name
# libnamec -> C target name (if used)
set (options CPP_WRAPS_C) set (options CPP_WRAPS_C)
set (oneValueArgs NAME DESCRIPTION) set (oneValueArgs NAME DESCRIPTION)
set (multiValueArgs CPP_HDR CPP_SRC C_HDR C_SRC FTI_SRC FTI_HDR REQUIRES) set (multiValueArgs CPP_HDR CPP_SRC C_HDR C_SRC FTI_SRC FTI_HDR REQUIRES)
@ -468,18 +451,20 @@ function (UPM_MIXED_MODULE_INIT)
## "export" the logical C++ lib target for the calling module's ## "export" the logical C++ lib target for the calling module's
## CMakeLists.txt ## CMakeLists.txt
set (libnamecxx ${libname} PARENT_SCOPE) set (libname ${libname} PARENT_SCOPE)
endif (BUILDCPP AND UPM_MIXED_MODULE_INIT_CPP_HDR) endif (BUILDCPP AND UPM_MIXED_MODULE_INIT_CPP_HDR)
endfunction (UPM_MIXED_MODULE_INIT) endfunction (UPM_MIXED_MODULE_INIT)
macro(upm_module_init) function(upm_module_init)
set (basename ${libname}) set (basename ${libname})
# If this is a C library, handle different collateral naming # If this is a C library, handle different collateral naming
if (IS_C_LIBRARY) if (IS_C_LIBRARY)
set (libname ${libname}-c) set (libname ${libname}-c)
# If this is a C library, export C library target name to parent's libname
set (libname ${libname} PARENT_SCOPE)
set (libprefix upmc-) set (libprefix upmc-)
set (pcname upmc-${basename}.pc) set (pcname upmc-${basename}.pc)
else () else ()
@ -528,7 +513,7 @@ macro(upm_module_init)
cpack_add_component (${libname} DISPLAY_NAME ${libname} REQUIRED INSTALL_TYPES all) cpack_add_component (${libname} DISPLAY_NAME ${libname} REQUIRED INSTALL_TYPES all)
set(CPACK_COMPONENT_${libname}_DESCRIPTION "${libdescription}") set(CPACK_COMPONENT_${libname}_DESCRIPTION "${libdescription}")
endif() endif()
endmacro(upm_module_init) endfunction(upm_module_init)
# Top-level module init # Top-level module init
if (BUILDSWIGPYTHON) if (BUILDSWIGPYTHON)