[Cmake-commits] [cmake-commits] hoffman committed CMakeLists.txt 1.21 1.22

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Tests/Fortran
In directory public:/mounts/ram/cvs-serv31717

Modified Files:
	CMakeLists.txt 
Log Message:
ENH: make the test pass when fortran is gnu and c is cl


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/Fortran/CMakeLists.txt,v
retrieving revision 1.21
retrieving revision 1.22
diff -C 2 -d -r1.21 -r1.22
*** CMakeLists.txt	6 Nov 2008 14:41:08 -0000	1.21
--- CMakeLists.txt	6 Nov 2008 22:33:42 -0000	1.22
***************
*** 1,12 ****
  cmake_minimum_required (VERSION 2.6)
! PROJECT(testf C Fortran)
  message("CTEST_FULL_OUTPUT ")
! SET(CMAKE_VERBOSE_MAKEFILE 1)
! MESSAGE("ENV_FLAGS = $ENV{FFLAGS}")
! MESSAGE("CMAKE_Fortran_COMPILER_INIT = ${CMAKE_Fortran_COMPILER_INIT}")
! MESSAGE("CMAKE_Fortran_COMPILER_FULLPATH = ${CMAKE_Fortran_COMPILER_FULLPATH}")
! MESSAGE("CMAKE_Fortran_COMPILER = ${CMAKE_Fortran_COMPILER}")
! MESSAGE("CMAKE_Fortran_FLAGS = ${CMAKE_Fortran_FLAGS}")
! ADD_EXECUTABLE(testf hello.f)
  
  
--- 1,12 ----
  cmake_minimum_required (VERSION 2.6)
! project(testf Fortran C)
  message("CTEST_FULL_OUTPUT ")
! set(CMAKE_VERBOSE_MAKEFILE 1)
! message("ENV_FLAGS = $ENV{FFLAGS}")
! message("CMAKE_Fortran_COMPILER_INIT = ${CMAKE_Fortran_COMPILER_INIT}")
! message("CMAKE_Fortran_COMPILER_FULLPATH = ${CMAKE_Fortran_COMPILER_FULLPATH}")
! message("CMAKE_Fortran_COMPILER = ${CMAKE_Fortran_COMPILER}")
! message("CMAKE_Fortran_FLAGS = ${CMAKE_Fortran_FLAGS}")
! add_executable(testf hello.f)
  
  
***************
*** 88,91 ****
--- 88,101 ----
    message("Fortran = ${CMAKE_Fortran_COMPILER_ID}")
    message("C = ${CMAKE_C_COMPILER_ID}")
+   # hack to make g77 work after CL has been enabled 
+   # as a languge, cmake needs language specific versions
+   # of these variables....
+   if(WIN32 AND "${CMAKE_Fortran_COMPILER_ID}" MATCHES "GNU")
+     set(CMAKE_CREATE_CONSOLE_EXE )
+     set(CMAKE_LIBRARY_PATH_FLAG "-L")
+     set(CMAKE_LINK_LIBRARY_FLAG "-l")
+     set(CMAKE_LINK_LIBRARY_SUFFIX )
+   endif()
+ 
  endif()
  
***************
*** 93,127 ****
  
  
! SET(TEST_MODULE_DEPENDS 0)
! IF(CMAKE_Fortran_COMPILER_SUPPORTS_F90)
!   ADD_EXECUTABLE(test_module
      test_module_main.f90
      test_module_implementation.f90
      test_module_interface.f90)
  
!   ADD_EXECUTABLE(test_use_in_comment_fixedform
      test_use_in_comment_fixedform.f)
!   ADD_EXECUTABLE(test_use_in_comment_freeform 
      test_use_in_comment_freeform.f90)
  
!   ADD_EXECUTABLE(test_in_interface 
      in_interface/main.f90
      in_interface/module.f90)
  
!   ADD_DEFINITIONS(-DFOO -DBAR=1)
!   ADD_EXECUTABLE(test_preprocess test_preprocess.F90)
  
!   SET(TEST_MODULE_DEPENDS 1)
! ENDIF(CMAKE_Fortran_COMPILER_SUPPORTS_F90)
  
! IF(TEST_MODULE_DEPENDS)
    # Build the external project separately using a custom target.
    # Make sure it uses the same build configuration as this test.
!   IF(CMAKE_CONFIGURATION_TYPES)
!     SET(External_CONFIG_TYPE -C "${CMAKE_CFG_INTDIR}")
!   ELSE(CMAKE_CONFIGURATION_TYPES)
!     SET(External_CONFIG_TYPE)
!   ENDIF(CMAKE_CONFIGURATION_TYPES)
!   ADD_CUSTOM_COMMAND(
      OUTPUT ${testf_BINARY_DIR}/ExternalProject
      COMMAND ${CMAKE_CTEST_COMMAND}
--- 103,137 ----
  
  
! set(TEST_MODULE_DEPENDS 0)
! if(CMAKE_Fortran_COMPILER_SUPPORTS_F90)
!   add_executable(test_module
      test_module_main.f90
      test_module_implementation.f90
      test_module_interface.f90)
  
!   add_executable(test_use_in_comment_fixedform
      test_use_in_comment_fixedform.f)
!   add_executable(test_use_in_comment_freeform 
      test_use_in_comment_freeform.f90)
  
!   add_executable(test_in_interface 
      in_interface/main.f90
      in_interface/module.f90)
  
!   add_definitions(-DFOO -DBAR=1)
!   add_executable(test_preprocess test_preprocess.F90)
  
!   set(TEST_MODULE_DEPENDS 1)
! endif(CMAKE_Fortran_COMPILER_SUPPORTS_F90)
  
! if(TEST_MODULE_DEPENDS)
    # Build the external project separately using a custom target.
    # Make sure it uses the same build configuration as this test.
!   if(CMAKE_CONFIGURATION_TYPES)
!     set(External_CONFIG_TYPE -C "${CMAKE_CFG_INTDIR}")
!   else(CMAKE_CONFIGURATION_TYPES)
!     set(External_CONFIG_TYPE)
!   endif(CMAKE_CONFIGURATION_TYPES)
!   add_custom_command(
      OUTPUT ${testf_BINARY_DIR}/ExternalProject
      COMMAND ${CMAKE_CTEST_COMMAND}
***************
*** 142,155 ****
                           -DCMAKE_Fortran_FLAGS_RELWITHDEBINFO:STRING=${CMAKE_Fortran_FLAGS_RELWITHDEBINFO}
           )
!   ADD_CUSTOM_TARGET(ExternalTarget ALL DEPENDS ${testf_BINARY_DIR}/ExternalProject)
  
    # Test module output directory if available.
!   IF(CMAKE_Fortran_MODDIR_FLAG)
!     SET(Library_MODDIR "${testf_BINARY_DIR}/Library/modules")
!   ELSE(CMAKE_Fortran_MODDIR_FLAG)
!     SET(Library_MODDIR "${testf_BINARY_DIR}/Library")
!   ENDIF(CMAKE_Fortran_MODDIR_FLAG)
  
!   ADD_SUBDIRECTORY(Library)
!   ADD_SUBDIRECTORY(Executable)
! ENDIF(TEST_MODULE_DEPENDS)
--- 152,165 ----
                           -DCMAKE_Fortran_FLAGS_RELWITHDEBINFO:STRING=${CMAKE_Fortran_FLAGS_RELWITHDEBINFO}
           )
!   add_custom_target(ExternalTarget ALL DEPENDS ${testf_BINARY_DIR}/ExternalProject)
  
    # Test module output directory if available.
!   if(CMAKE_Fortran_MODDIR_FLAG)
!     set(Library_MODDIR "${testf_BINARY_DIR}/Library/modules")
!   else(CMAKE_Fortran_MODDIR_FLAG)
!     set(Library_MODDIR "${testf_BINARY_DIR}/Library")
!   endif(CMAKE_Fortran_MODDIR_FLAG)
  
!   add_subdirectory(Library)
!   add_subdirectory(Executable)
! endif(TEST_MODULE_DEPENDS)