[Cmake-commits] [cmake-commits] king committed ImplicitLinkInfoTest.cmake.in 1.7 1.8

cmake-commits at cmake.org cmake-commits at cmake.org
Wed Oct 7 08:43:55 EDT 2009


Update of /cvsroot/CMake/CMake/Tests/CMakeTests
In directory public:/mounts/ram/cvs-serv11553/Tests/CMakeTests

Modified Files:
	ImplicitLinkInfoTest.cmake.in 
Log Message:
More robust implicit link line detection regex

The regex used by CMAKE_PARSE_IMPLICIT_LINK_INFO to detect link lines
should not match lines that happen to have ".../ld.../..." in them.  A
linker name should match only as the last component of a path.

See issue #9666.


Index: ImplicitLinkInfoTest.cmake.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/CMakeTests/ImplicitLinkInfoTest.cmake.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -C 2 -d -r1.7 -r1.8
*** ImplicitLinkInfoTest.cmake.in	6 Oct 2009 19:16:12 -0000	1.7
--- ImplicitLinkInfoTest.cmake.in	7 Oct 2009 12:43:51 -0000	1.8
***************
*** 78,81 ****
--- 78,89 ----
  list(APPEND platforms linux64_pgf90)
  
+ # gcc dummy.c -v # in strange path
+ set(linux64_test1_text "
+ /this/might/match/as/a/linker/ld/but/it/is/not because the ld is not the last path component
+ ${linux64_gcc_text}")
+ set(linux64_test1_libs "${linux64_gcc_libs}")
+ set(linux64_test1_dirs "${linux64_gcc_dirs}")
+ list(APPEND platforms linux64_test1)
+ 
  #-----------------------------------------------------------------------------
  # Sun



More information about the Cmake-commits mailing list