[Cmake-commits] [cmake-commits] king committed CMakeLists.txt 1.2 1.3 Flags.cmake.in 1.1 1.2

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Tests/FortranC
In directory public:/mounts/ram/cvs-serv30361/Tests/FortranC

Modified Files:
	CMakeLists.txt Flags.cmake.in 
Log Message:
Honor real language flags in FortranC.Flags test

The test overrides the CMAKE_C_FLAGS and CMAKE_Fortran_FLAGS to test
passing a specific flag to the compiler wrapper scripts.  We fix it to
honor any outside flags needed for the real compiler.


Index: Flags.cmake.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/FortranC/Flags.cmake.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** Flags.cmake.in	14 Dec 2009 17:36:23 -0000	1.1
--- Flags.cmake.in	15 Dec 2009 19:03:03 -0000	1.2
***************
*** 13,19 ****
  set(COMMAND)
  
- set(ENV{CFLAGS})
- set(ENV{FFLAGS})
- 
  execute_process(
    WORKING_DIRECTORY "${bld}"
--- 13,16 ----
***************
*** 21,25 ****
--- 18,24 ----
                             "-DFortranC_TEST_FLAGS=1"
                             "-DCMAKE_C_COMPILER=${bld}/cc.sh"
+                            "-DCMAKE_C_FLAGS:STRING=@CMAKE_C_FLAGS@"
                             "-DCMAKE_Fortran_COMPILER=${bld}/fc.sh"
+                            "-DCMAKE_Fortran_FLAGS:STRING=@CMAKE_Fortran_FLAGS@"
    RESULT_VARIABLE result
    )

Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/FortranC/CMakeLists.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** CMakeLists.txt	15 Dec 2009 19:02:52 -0000	1.2
--- CMakeLists.txt	15 Dec 2009 19:03:03 -0000	1.3
***************
*** 15,23 ****
    # Test whether FortranCInterface checks see C flags.
    set(ENV{TEST_OPT_CC} "--test-opt-cc=1")
!   set(CMAKE_C_FLAGS "$ENV{TEST_OPT_CC}")
  
    # Test whether FortranCInterface checks see Fortran flags.
    set(ENV{TEST_OPT_FC} "--test-opt-fc=1")
!   set(CMAKE_Fortran_FLAGS "$ENV{TEST_OPT_FC}")
  endif()
  
--- 15,23 ----
    # Test whether FortranCInterface checks see C flags.
    set(ENV{TEST_OPT_CC} "--test-opt-cc=1")
!   set(CMAKE_C_FLAGS "$ENV{TEST_OPT_CC} ${CMAKE_C_FLAGS}")
  
    # Test whether FortranCInterface checks see Fortran flags.
    set(ENV{TEST_OPT_FC} "--test-opt-fc=1")
!   set(CMAKE_Fortran_FLAGS "$ENV{TEST_OPT_FC} ${CMAKE_Fortran_FLAGS}")
  endif()