@ -6,7 +6,7 @@ function( calamares_add_module_subdirectory )
# I f t h i s s u b d i r e c t o r y h a s a C M a k e L i s t s . t x t , w e a d d _ s u b d i r e c t o r y i t . . .
# I f t h i s s u b d i r e c t o r y h a s a C M a k e L i s t s . t x t , w e a d d _ s u b d i r e c t o r y i t . . .
if ( EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIRECTORY}/CMakeLists.txt" )
if ( EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIRECTORY}/CMakeLists.txt" )
add_subdirectory ( ${ SUBDIRECTORY } )
add_subdirectory ( ${ SUBDIRECTORY } )
# . . . o t h e r w i s e , w e l o o k f o r a m o d u l e . co n f .
# . . . o t h e r w i s e , w e l o o k f o r a m o d u l e . de s c .
elseif ( EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIRECTORY}/module.desc" )
elseif ( EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIRECTORY}/module.desc" )
set ( MODULES_DIR ${ CMAKE_INSTALL_LIBDIR } /calamares/modules )
set ( MODULES_DIR ${ CMAKE_INSTALL_LIBDIR } /calamares/modules )
set ( MODULE_DESTINATION ${ MODULES_DIR } / ${ SUBDIRECTORY } )
set ( MODULE_DESTINATION ${ MODULES_DIR } / ${ SUBDIRECTORY } )
@ -37,7 +37,7 @@ function( calamares_add_module_subdirectory )
message ( "" )
message ( "" )
endif ( )
endif ( )
else ( )
else ( )
message ( "-- ${BoldYellow}Warning:${ColorReset} tried to add module subdirectory ${BoldRed}${SUBDIRECTORY}${ColorReset} which has no CMakeLists.txt or module. conf ." )
message ( "-- ${BoldYellow}Warning:${ColorReset} tried to add module subdirectory ${BoldRed}${SUBDIRECTORY}${ColorReset} which has no CMakeLists.txt or module. des c." )
message ( "" )
message ( "" )
endif ( )
endif ( )
endfunction ( )
endfunction ( )