kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'fix-BundleUtilities-cryptic-error-message' 

8f0667c BundleUtilities: Avoid a cryptic and unhelpful error message
This commit is contained in:
Brad King 2011-06-07 14:05:57 -04:00 committed by CMake Topic Stage
parent 313a633b85 8f0667c113
commit 43d3048582
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Modules/BundleUtilities.cmake
View File

@ -546,13 +546,25 @@ function(fixup_bundle_item resolved_embedded_item exepath dirs)
# #
get_dotapp_dir("${exepath}" exe_dotapp_dir) get_dotapp_dir("${exepath}" exe_dotapp_dir)
string(LENGTH "${exe_dotapp_dir}/" exe_dotapp_dir_length) string(LENGTH "${exe_dotapp_dir}/" exe_dotapp_dir_length)
string(SUBSTRING "${resolved_embedded_item}" 0 ${exe_dotapp_dir_length} item_substring) string(LENGTH "${resolved_embedded_item}" resolved_embedded_item_length)
if(NOT "${exe_dotapp_dir}/" STREQUAL "${item_substring}") set(path_too_short 0)
set(is_embedded 0)
if(${resolved_embedded_item_length} LESS ${exe_dotapp_dir_length})
set(path_too_short 1)
endif()
if(NOT path_too_short)
string(SUBSTRING "${resolved_embedded_item}" 0 ${exe_dotapp_dir_length} item_substring)
if("${exe_dotapp_dir}/" STREQUAL "${item_substring}")
set(is_embedded 1)
endif()
endif()
if(NOT is_embedded)
message(" exe_dotapp_dir/='${exe_dotapp_dir}/'") message(" exe_dotapp_dir/='${exe_dotapp_dir}/'")
message(" item_substring='${item_substring}'") message(" item_substring='${item_substring}'")
message(" resolved_embedded_item='${resolved_embedded_item}'") message(" resolved_embedded_item='${resolved_embedded_item}'")
message("") message("")
message("Install or copy the item into the bundle before calling fixup_bundle") message("Install or copy the item into the bundle before calling fixup_bundle.")
message("Or maybe there's a typo or incorrect path in one of the args to fixup_bundle?")
message("") message("")
message(FATAL_ERROR "cannot fixup an item that is not in the bundle...") message(FATAL_ERROR "cannot fixup an item that is not in the bundle...")
endif() endif()