hero123457/uhd
1
0
Fork 0
mirror of https://github.com/EttusResearch/uhd.git synced 2026-10-25 17:36:10 +00:00
Code Issues Projects Releases Wiki Activity

mpm: fixed cmake macro for enabling modules

Browse Source 
The macro MPM_REGISTER_COMPONENT did not work as described: in case
the default enable was set to ON and all dependencies were met, the
module was still not enabled.

Also made the status prints more helpful:
- print the default value,
- print the user override (if one was provided)
- print the resulting VAR = VALUE
- print the override hint only if the user did not
  already specify an override

Example of old incorrect behavior:
-- Configuring Mykonos support...
--   Dependency ENABLE_LIBMPM = ON
--   Disabling Mykonos support.
--   Override with -DENABLE_MYKONOS=ON/OFF

Example of new correct behavior (also with changed prints):
-- Configuring Mykonos support...
--   Default value ENABLE_MYKONOS = ON
--   Dependency ENABLE_LIBMPM = ON
--   Enabling Mykonos support (ENABLE_MYKONOS = ON)
--   Override with -DENABLE_MYKONOS=ON/OFF
This commit is contained in:
Joerg Hofrichter 2020-01-22 17:19:04 +01:00 committed by Martin Braun
parent 84bb89878c
commit 608c8a3ab3
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
mpm/cmake/Modules/MPMComponent.cmake
View File

@ -24,9 +24,6 @@ set(_mpm_disabled_components "" CACHE INTERNAL "" FORCE)
macro(MPM_REGISTER_COMPONENT name var enb deps dis req)
message(STATUS "")
message(STATUS "Configuring ${name} support...")
foreach(dep ${deps})
message(STATUS " Dependency ${dep} = ${${dep}}")
endforeach(dep)
# If user specified option, store here. Note: If the user doesn't specify
# this option on the cmake command line, both user_enabled and
@ -44,11 +41,17 @@ macro(MPM_REGISTER_COMPONENT name var enb deps dis req)
# Override default if user set
if(user_enabled OR user_disabled)
message(STATUS " User forced ${var} = ${${var}}")
set(option "${${var}}")
else(user_enabled OR user_disabled)
set(option ${req})
message(STATUS " Default value ${var} = ${enb}")
set(option ${enb})
endif()
foreach(dep ${deps})
message(STATUS " Dependency ${dep} = ${${dep}}")
endforeach(dep)
# setup the dependent option for this component
include(CMakeDependentOption)
CMAKE_DEPENDENT_OPTION(${var} "enable ${name} support" ${option} "${deps}" ${dis})
@ -67,13 +70,15 @@ macro(MPM_REGISTER_COMPONENT name var enb deps dis req)
#append the component into one of the lists
if(${var})
message(STATUS " Enabling ${name} support.")
message(STATUS " Enabling ${name} support (${var} = ${${var}})")
list(APPEND _mpm_enabled_components ${name})
else(${var})
message(STATUS " Disabling ${name} support.")
message(STATUS " Disabling ${name} support (${var} = ${${var}})")
list(APPEND _mpm_disabled_components ${name})
endif(${var})
message(STATUS " Override with -D${var}=ON/OFF")
if(NOT user_enabled AND NOT user_disabled)
message(STATUS " Override with -D${var}=ON/OFF")
endif(NOT user_enabled AND NOT user_disabled)
#make components lists into global variables
set(_mpm_enabled_components ${_uhd_enabled_components} CACHE INTERNAL "" FORCE)