napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake: fix defaults-handling which was breaking in-tree build

Browse Source
This commit is contained in:
Adriaan de Groot 2018-03-16 11:51:50 -04:00
parent abe05ac8ab
commit ace30e149a
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
CMakeModules/CalamaresAddBrandingSubdirectory.cmake
View File

@ -54,8 +54,11 @@ include( CMakeColors )
# If SUBDIRECTORIES are given, then those are copied (each one level deep) # If SUBDIRECTORIES are given, then those are copied (each one level deep)
# to the installation location as well, preserving the subdirectory name. # to the installation location as well, preserving the subdirectory name.
function( calamares_add_branding NAME ) function( calamares_add_branding NAME )
set( _CABT_DIRECTORY "." )
cmake_parse_arguments( _CABT "" "DIRECTORY" "SUBDIRECTORIES" ${ARGN} ) cmake_parse_arguments( _CABT "" "DIRECTORY" "SUBDIRECTORIES" ${ARGN} )
if (NOT _CABT_DIRECTORY)
set(_CABT_DIRECTORY ".")
endif()
set( SUBDIRECTORY ${_CABT_DIRECTORY} ) set( SUBDIRECTORY ${_CABT_DIRECTORY} )
set( _brand_dir ${_CABT_DIRECTORY} ) set( _brand_dir ${_CABT_DIRECTORY} )
@ -92,8 +95,11 @@ endfunction()
# the lang/ dir is found in the given <dir> instead of the current source # the lang/ dir is found in the given <dir> instead of the current source
# directory. # directory.
function( calamares_add_branding_translations NAME ) function( calamares_add_branding_translations NAME )
set( _CABT_DIRECTORY "." )
cmake_parse_arguments( _CABT "" "DIRECTORY" "" ${ARGN} ) cmake_parse_arguments( _CABT "" "DIRECTORY" "" ${ARGN} )
if (NOT _CABT_DIRECTORY)
set(_CABT_DIRECTORY ".")
endif()
set( SUBDIRECTORY ${_CABT_DIRECTORY} ) set( SUBDIRECTORY ${_CABT_DIRECTORY} )
set( _brand_dir ${_CABT_DIRECTORY} ) set( _brand_dir ${_CABT_DIRECTORY} )
@ -126,8 +132,10 @@ endfunction()
# If SUBDIRECTORIES are given, they are relative to <dir>, and are # If SUBDIRECTORIES are given, they are relative to <dir>, and are
# copied (one level deep) to the install location as well. # copied (one level deep) to the install location as well.
function( calamares_add_branding_subdirectory SUBDIRECTORY ) function( calamares_add_branding_subdirectory SUBDIRECTORY )
set( _CABS_NAME "${SUBDIRECTORY}" )
cmake_parse_arguments( _CABS "" "NAME" "SUBDIRECTORIES" ${ARGN} ) cmake_parse_arguments( _CABS "" "NAME" "SUBDIRECTORIES" ${ARGN} )
if (NOT _CABS_NAME)
set(_CABS_NAME "${SUBDIRECTORY}")
endif()
if( EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIRECTORY}/CMakeLists.txt" ) if( EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIRECTORY}/CMakeLists.txt" )
add_subdirectory( ${SUBDIRECTORY} ) add_subdirectory( ${SUBDIRECTORY} )