diff options
| author | David Cole <david.cole@kitware.com> | 2011-09-07 19:37:27 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2011-09-07 19:37:27 (GMT) |
| commit | d9ad72542ae60b34d1b0debd3fd4616d9896985f (patch) | |
| tree | cc47cb616e9d1619896d518a1c96a008d079c354 /Tests | |
| parent | 103ab60dd7314f6a75b02dc65d40a99efedc5391 (diff) | |
| parent | 90efed6ee60fde3a1211672854f7e23affa8b983 (diff) | |
| download | CMake-d9ad72542ae60b34d1b0debd3fd4616d9896985f.zip CMake-d9ad72542ae60b34d1b0debd3fd4616d9896985f.tar.gz CMake-d9ad72542ae60b34d1b0debd3fd4616d9896985f.tar.bz2 | |
Merge topic 'fortran-format'
90efed6 Xcode: Honor Fortran_FORMAT target and source file property
5c0c635 Fortran: Add support for free- and fixed-form flags
47a0c75 VS: Map Fortran free- and fixed-format flags to IDE options
d6e2a06 VS: Map per-source Fortran flags to IDE options
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/Fortran/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Tests/FortranOnly/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | Tests/FortranOnly/world.f | 9 |
3 files changed, 9 insertions, 5 deletions
diff --git a/Tests/Fortran/CMakeLists.txt b/Tests/Fortran/CMakeLists.txt index c216529..ba0bdcc 100644 --- a/Tests/Fortran/CMakeLists.txt +++ b/Tests/Fortran/CMakeLists.txt @@ -161,8 +161,10 @@ if(CMAKE_Fortran_COMPILER_SUPPORTS_F90) add_executable(test_use_in_comment_fixedform test_use_in_comment_fixedform.f) + set_property(SOURCE test_use_in_comment_fixedform.f PROPERTY Fortran_FORMAT FIXED) add_executable(test_use_in_comment_freeform test_use_in_comment_freeform.f90) + set_property(SOURCE test_use_in_comment_freeform.f90 PROPERTY Fortran_FORMAT FREE) add_executable(test_in_interface in_interface/main.f90 diff --git a/Tests/FortranOnly/CMakeLists.txt b/Tests/FortranOnly/CMakeLists.txt index 3c4f0e7..d57a8b2 100644 --- a/Tests/FortranOnly/CMakeLists.txt +++ b/Tests/FortranOnly/CMakeLists.txt @@ -4,6 +4,9 @@ message("CTEST_FULL_OUTPUT ") # create a library with hello and world functions add_library(FortranOnlylib hello.f world.f) +set_property(TARGET FortranOnlylib PROPERTY Fortran_FORMAT FIXED) +set_property(SOURCE world.f PROPERTY Fortran_FORMAT FREE) + # create an executable that calls hello and world add_executable(FortranOnly testf.f) target_link_libraries(FortranOnly FortranOnlylib) diff --git a/Tests/FortranOnly/world.f b/Tests/FortranOnly/world.f index deae3fa..342b244 100644 --- a/Tests/FortranOnly/world.f +++ b/Tests/FortranOnly/world.f @@ -1,5 +1,4 @@ - SUBROUTINE WORLD - - PRINT *, 'World!' - - END +! Free-format ".f" file to test Fortran_FORMAT property +SUBROUTINE WORLD + PRINT *, 'World!' +END |