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

CMake: Moved swig macros to functions

Browse Source 
Switched these macros to functions so changes at the
upm_swig_<extension> level don't propogate further than necessary.

Signed-off-by: Noel Eck <noel.eck@intel.com>
This commit is contained in:
Noel Eck 2018-01-22 16:32:20 -08:00
parent f97a62b055
commit abefdfc756
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/CMakeLists.txt
View File

@ -308,7 +308,7 @@ macro(_upm_swig_python)
endmacro(_upm_swig_python) endmacro(_upm_swig_python)
# Generate both python2 and python3 modules if possible # Generate both python2 and python3 modules if possible
macro(upm_swig_python) function(upm_swig_python)
# Skip if the libname is in the blacklist # Skip if the libname is in the blacklist
if (NOT ";${PYTHONSWIG_BLACKLIST};" MATCHES ";${libname};") if (NOT ";${PYTHONSWIG_BLACKLIST};" MATCHES ";${libname};")
# Generate python2 module if python2 libs are available # Generate python2 module if python2 libs are available
@ -341,9 +341,9 @@ macro(upm_swig_python)
CACHE INTERNAL "List of Python target names") CACHE INTERNAL "List of Python target names")
endif (PYTHON3LIBS_FOUND) endif (PYTHON3LIBS_FOUND)
endif (NOT ";${PYTHONSWIG_BLACKLIST};" MATCHES ";${libname};") endif (NOT ";${PYTHONSWIG_BLACKLIST};" MATCHES ";${libname};")
endmacro(upm_swig_python) endfunction(upm_swig_python)
macro(upm_swig_node) function(upm_swig_node)
# Skip if the libname is in the blacklist # Skip if the libname is in the blacklist
if (NOT ";${NODESWIG_BLACKLIST};" MATCHES ";${libname};") if (NOT ";${NODESWIG_BLACKLIST};" MATCHES ";${libname};")
# SWIG treats SWIG_FLAGS as a list and not a string so semicolon seperation is # SWIG treats SWIG_FLAGS as a list and not a string so semicolon seperation is
@ -418,9 +418,9 @@ macro(upm_swig_node)
# Keep track of all NODE targets # Keep track of all NODE targets
set(UPM_TARGETS_NODEJS ${UPM_TARGETS_NODEJS} jsupm_${libname} CACHE INTERNAL "List of NodeJs target names") set(UPM_TARGETS_NODEJS ${UPM_TARGETS_NODEJS} jsupm_${libname} CACHE INTERNAL "List of NodeJs target names")
endmacro(upm_swig_node) endfunction(upm_swig_node)
macro(upm_swig_java) function(upm_swig_java)
# Skip if the libname is in the blacklist # Skip if the libname is in the blacklist
if (NOT ";${JAVASWIG_BLACKLIST};" MATCHES ";${libname};") if (NOT ";${JAVASWIG_BLACKLIST};" MATCHES ";${libname};")
# Transitive headers don't appear to get picked up by swig_add_module call for # Transitive headers don't appear to get picked up by swig_add_module call for
@ -512,7 +512,7 @@ macro(upm_swig_java)
# Keep track of all JAVA targets # Keep track of all JAVA targets
set(UPM_TARGETS_JAVA ${UPM_TARGETS_JAVA} javaupm_${libname} CACHE INTERNAL "List of JAVA target names") set(UPM_TARGETS_JAVA ${UPM_TARGETS_JAVA} javaupm_${libname} CACHE INTERNAL "List of JAVA target names")
endif (NOT ";${JAVASWIG_BLACKLIST};" MATCHES ";${libname};") endif (NOT ";${JAVASWIG_BLACKLIST};" MATCHES ";${libname};")
endmacro(upm_swig_java) endfunction(upm_swig_java)
macro(upm_doxygen) macro(upm_doxygen)
if (DOXYGEN_FOUND) if (DOXYGEN_FOUND)