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

Fixed appending PATH to dumpbin tool from growing without bounds.

Browse Source 
IF(... MATCHES ...) used for comparing directories chokes especially in the case of C:\Program Files (x86)\<blah> because of regex pattern matching. Switched this to use STREQUAL in a loop instead.
This commit is contained in:
David Partyka 2010-10-25 13:40:35 -04:00
parent 06b5eaa3cf
commit be94c494ed
2 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Modules/GetPrerequisites.cmake
View File

@ -587,11 +587,19 @@ function(get_prerequisites target prerequisites_var exclude_system recurse exepa
# #
get_filename_component(gp_cmd_dir "${gp_cmd}" PATH) get_filename_component(gp_cmd_dir "${gp_cmd}" PATH)
get_filename_component(gp_cmd_dlls_dir "${gp_cmd_dir}/../../Common7/IDE" ABSOLUTE) get_filename_component(gp_cmd_dlls_dir "${gp_cmd_dir}/../../Common7/IDE" ABSOLUTE)
file(TO_NATIVE_PATH "${gp_cmd_dlls_dir}" gp_cmd_dlls_dir)
if(EXISTS "${gp_cmd_dlls_dir}") if(EXISTS "${gp_cmd_dlls_dir}")
# only add to the path if it is not already in the path # only add to the path if it is not already in the path
if(NOT "$ENV{PATH}" MATCHES "${gp_cmd_dlls_dir}") set(gp_found_cmd_dlls_dir 0)
foreach(gp_env_path_element $ENV{PATH})
if("${gp_env_path_element}" STREQUAL "${gp_cmd_dlls_dir}")
set(gp_found_cmd_dlls_dir 1)
endif()
endforeach(gp_env_path_element)
if(NOT gp_found_cmd_dlls_dir)
set(ENV{PATH} "$ENV{PATH};${gp_cmd_dlls_dir}") set(ENV{PATH} "$ENV{PATH};${gp_cmd_dlls_dir}")
endif(NOT "$ENV{PATH}" MATCHES "${gp_cmd_dlls_dir}") endif()
endif(EXISTS "${gp_cmd_dlls_dir}") endif(EXISTS "${gp_cmd_dlls_dir}")
endif("${gp_tool}" STREQUAL "dumpbin") endif("${gp_tool}" STREQUAL "dumpbin")
# #

14
Tests/CMakeTests/GetPrerequisitesTest.cmake.in
View File

@ -77,6 +77,11 @@ message(STATUS "")
list_prerequisites("${CMAKE_COMMAND}" 0 0 1) list_prerequisites("${CMAKE_COMMAND}" 0 0 1)
message(STATUS "") message(STATUS "")
message(STATUS "=============================================================================")
string(LENGTH "$ENV{PATH}" PATH_LENGTH_BEGIN)
message(STATUS "Begin PATH length is: ${PATH_LENGTH_BEGIN}")
message(STATUS "")
# Leave the code for these tests in here, but turn them off by default... they # Leave the code for these tests in here, but turn them off by default... they
# take longer than they're worth during development... # take longer than they're worth during development...
@ -139,6 +144,15 @@ foreach(v ${vs})
endforeach(v) endforeach(v)
message(STATUS "") message(STATUS "")
message(STATUS "=============================================================================")
string(LENGTH "$ENV{PATH}" PATH_LENGTH_END)
message(STATUS "Final PATH length is: ${PATH_LENGTH_END}")
if(PATH_LENGTH_END GREATER ${PATH_LENGTH_BEGIN})
message(FATAL_ERROR "list_prerequisties is endlessly appending the path of gp_tool to the PATH.")
endif()
message(STATUS "")
message(STATUS "=============================================================================") message(STATUS "=============================================================================")
message(STATUS "End of test") message(STATUS "End of test")