[Cmake-commits] [cmake-commits] king committed ImplicitLinkInfoTest.cmake.in 1.1 1.2

cmake-commits at cmake.org cmake-commits at cmake.org
Fri Jul 24 07:34:13 EDT 2009


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

Modified Files:
	ImplicitLinkInfoTest.cmake.in 
Log Message:
BUG: Avoid case change in ImplicitLinkInfo test

Since "get_filename_component(... ABSOLUTE)" retrieves the actual case
for existing paths on windows, we need to use an obscure path for mingw.
Otherwise the test can fail just because the case of the paths changes.


Index: ImplicitLinkInfoTest.cmake.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/CMakeTests/ImplicitLinkInfoTest.cmake.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** ImplicitLinkInfoTest.cmake.in	23 Jul 2009 14:07:39 -0000	1.1
--- ImplicitLinkInfoTest.cmake.in	24 Jul 2009 11:34:03 -0000	1.2
***************
*** 282,300 ****
  
  # gcc dummy.c -v
! set(msys_gcc_text " C:/mingw/bin/../libexec/gcc/mingw32/3.4.5/collect2.exe -Bdynamic /mingw/lib/crt2.o C:/mingw/bin/../lib/gcc/mingw32/3.4.5/crtbegin.o -LC:/mingw/bin/../lib/gcc/mingw32/3.4.5 -LC:/mingw/bin/../lib/gcc -L/mingw/lib -LC:/mingw/bin/../lib/gcc/mingw32/3.4.5/../../.. C:/home/user/AppData/Local/Temp/cckQmvRt.o -lmingw32 -lgcc -lmoldname -lmingwex -lmsvcrt -luser32 -lkernel32 -ladvapi32 -lshell32 -lmingw32 -lgcc -lmoldname -lmingwex -lmsvcrt C:/mingw/bin/../lib/gcc/mingw32/3.4.5/crtend.o")
  set(msys_gcc_libs "mingw32;gcc;moldname;mingwex;msvcrt;user32;kernel32;advapi32;shell32;mingw32;gcc;moldname;mingwex;msvcrt")
! set(msys_gcc_dirs "C:/mingw/lib/gcc/mingw32/3.4.5;C:/mingw/lib/gcc;/mingw/lib;C:/mingw/lib")
  list(APPEND platforms msys_gcc)
  
  # g++ dummy.cxx -v
! set(msys_g++_text " C:/mingw/bin/../libexec/gcc/mingw32/3.4.5/collect2.exe -Bdynamic /mingw/lib/crt2.o C:/mingw/bin/../lib/gcc/mingw32/3.4.5/crtbegin.o -LC:/mingw/bin/../lib/gcc/mingw32/3.4.5 -LC:/mingw/bin/../lib/gcc -L/mingw/lib -LC:/mingw/bin/../lib/gcc/mingw32/3.4.5/../../.. C:/home/user/AppData/Local/Temp/cci5hYPk.o -lstdc++ -lmingw32 -lgcc -lmoldname -lmingwex -lmsvcrt -luser32 -lkernel32 -ladvapi32 -lshell32 -lmingw32 -lgcc -lmoldname -lmingwex -lmsvcrt C:/mingw/bin/../lib/gcc/mingw32/3.4.5/crtend.o")
  set(msys_g++_libs "stdc++;mingw32;gcc;moldname;mingwex;msvcrt;user32;kernel32;advapi32;shell32;mingw32;gcc;moldname;mingwex;msvcrt")
! set(msys_g++_dirs "C:/mingw/lib/gcc/mingw32/3.4.5;C:/mingw/lib/gcc;/mingw/lib;C:/mingw/lib")
  list(APPEND platforms msys_g++)
  
  # g77 dummy.f -v
! set(msys_g77_text " C:/mingw/bin/../libexec/gcc/mingw32/3.4.5/collect2.exe -Bdynamic /mingw/lib/crt2.o C:/mingw/bin/../lib/gcc/mingw32/3.4.5/crtbegin.o -LC:/mingw/bin/../lib/gcc/mingw32/3.4.5 -LC:/mingw/bin/../lib/gcc -L/mingw/lib -LC:/mingw/bin/../lib/gcc/mingw32/3.4.5/../../.. C:/home/user/AppData/Local/Temp/ccabRxQ1.o -lfrtbegin -lg2c -lmingw32 -lgcc -lmoldname -lmingwex -lmsvcrt -luser32 -lkernel32 -ladvapi32 -lshell32 -lmingw32 -lgcc -lmoldname -lmingwex -lmsvcrt C:/mingw/bin/../lib/gcc/mingw32/3.4.5/crtend.o")
  set(msys_g77_libs "frtbegin;g2c;mingw32;gcc;moldname;mingwex;msvcrt;user32;kernel32;advapi32;shell32;mingw32;gcc;moldname;mingwex;msvcrt")
! set(msys_g77_dirs "C:/mingw/lib/gcc/mingw32/3.4.5;C:/mingw/lib/gcc;/mingw/lib;C:/mingw/lib")
  list(APPEND platforms msys_g77)
  
--- 282,300 ----
  
  # gcc dummy.c -v
! set(msys_gcc_text " C:/some-mingw/bin/../libexec/gcc/mingw32/3.4.5/collect2.exe -Bdynamic /mingw/lib/crt2.o C:/some-mingw/bin/../lib/gcc/mingw32/3.4.5/crtbegin.o -LC:/some-mingw/bin/../lib/gcc/mingw32/3.4.5 -LC:/some-mingw/bin/../lib/gcc -L/mingw/lib -LC:/some-mingw/bin/../lib/gcc/mingw32/3.4.5/../../.. C:/home/user/AppData/Local/Temp/cckQmvRt.o -lmingw32 -lgcc -lmoldname -lmingwex -lmsvcrt -luser32 -lkernel32 -ladvapi32 -lshell32 -lmingw32 -lgcc -lmoldname -lmingwex -lmsvcrt C:/some-mingw/bin/../lib/gcc/mingw32/3.4.5/crtend.o")
  set(msys_gcc_libs "mingw32;gcc;moldname;mingwex;msvcrt;user32;kernel32;advapi32;shell32;mingw32;gcc;moldname;mingwex;msvcrt")
! set(msys_gcc_dirs "C:/some-mingw/lib/gcc/mingw32/3.4.5;C:/some-mingw/lib/gcc;/mingw/lib;C:/some-mingw/lib")
  list(APPEND platforms msys_gcc)
  
  # g++ dummy.cxx -v
! set(msys_g++_text " C:/some-mingw/bin/../libexec/gcc/mingw32/3.4.5/collect2.exe -Bdynamic /mingw/lib/crt2.o C:/some-mingw/bin/../lib/gcc/mingw32/3.4.5/crtbegin.o -LC:/some-mingw/bin/../lib/gcc/mingw32/3.4.5 -LC:/some-mingw/bin/../lib/gcc -L/mingw/lib -LC:/some-mingw/bin/../lib/gcc/mingw32/3.4.5/../../.. C:/home/user/AppData/Local/Temp/cci5hYPk.o -lstdc++ -lmingw32 -lgcc -lmoldname -lmingwex -lmsvcrt -luser32 -lkernel32 -ladvapi32 -lshell32 -lmingw32 -lgcc -lmoldname -lmingwex -lmsvcrt C:/some-mingw/bin/../lib/gcc/mingw32/3.4.5/crtend.o")
  set(msys_g++_libs "stdc++;mingw32;gcc;moldname;mingwex;msvcrt;user32;kernel32;advapi32;shell32;mingw32;gcc;moldname;mingwex;msvcrt")
! set(msys_g++_dirs "C:/some-mingw/lib/gcc/mingw32/3.4.5;C:/some-mingw/lib/gcc;/mingw/lib;C:/some-mingw/lib")
  list(APPEND platforms msys_g++)
  
  # g77 dummy.f -v
! set(msys_g77_text " C:/some-mingw/bin/../libexec/gcc/mingw32/3.4.5/collect2.exe -Bdynamic /mingw/lib/crt2.o C:/some-mingw/bin/../lib/gcc/mingw32/3.4.5/crtbegin.o -LC:/some-mingw/bin/../lib/gcc/mingw32/3.4.5 -LC:/some-mingw/bin/../lib/gcc -L/mingw/lib -LC:/some-mingw/bin/../lib/gcc/mingw32/3.4.5/../../.. C:/home/user/AppData/Local/Temp/ccabRxQ1.o -lfrtbegin -lg2c -lmingw32 -lgcc -lmoldname -lmingwex -lmsvcrt -luser32 -lkernel32 -ladvapi32 -lshell32 -lmingw32 -lgcc -lmoldname -lmingwex -lmsvcrt C:/some-mingw/bin/../lib/gcc/mingw32/3.4.5/crtend.o")
  set(msys_g77_libs "frtbegin;g2c;mingw32;gcc;moldname;mingwex;msvcrt;user32;kernel32;advapi32;shell32;mingw32;gcc;moldname;mingwex;msvcrt")
! set(msys_g77_dirs "C:/some-mingw/lib/gcc/mingw32/3.4.5;C:/some-mingw/lib/gcc;/mingw/lib;C:/some-mingw/lib")
  list(APPEND platforms msys_g77)
  



More information about the Cmake-commits mailing list