diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2012-01-27 16:14:00 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2012-02-09 13:38:52 (GMT) |
| commit | 48a09f82ccadf93eb2d60c9efe5da783327a8520 (patch) | |
| tree | d6a8acaca1b3bfa6c4288d36c956a48324d506d7 /Tests/VSGNUFortran | |
| parent | 067c1f44a80ed8fb32e56918a57437142c64b049 (diff) | |
| download | CMake-48a09f82ccadf93eb2d60c9efe5da783327a8520.zip CMake-48a09f82ccadf93eb2d60c9efe5da783327a8520.tar.gz CMake-48a09f82ccadf93eb2d60c9efe5da783327a8520.tar.bz2 | |
CMakeAddFortranSubdirectory: Make IMPORTED targets GLOBAL
cmake_add_fortran_directory uses imported targets when using the
mingw fortran compiler. This change makes those targets global
in scope so they act just like the real targets that exist when
a fortran compiler exists and regular add_subdirectory is used.
Diffstat (limited to 'Tests/VSGNUFortran')
| -rw-r--r-- | Tests/VSGNUFortran/CMakeLists.txt | 19 | ||||
| -rw-r--r-- | Tests/VSGNUFortran/subdir/CMakeLists.txt | 15 | ||||
| -rw-r--r-- | Tests/VSGNUFortran/subdir/fortran/CMakeLists.txt (renamed from Tests/VSGNUFortran/fortran/CMakeLists.txt) | 0 | ||||
| -rw-r--r-- | Tests/VSGNUFortran/subdir/fortran/hello.f (renamed from Tests/VSGNUFortran/fortran/hello.f) | 0 | ||||
| -rw-r--r-- | Tests/VSGNUFortran/subdir/fortran/world.f (renamed from Tests/VSGNUFortran/fortran/world.f) | 0 |
5 files changed, 17 insertions, 17 deletions
diff --git a/Tests/VSGNUFortran/CMakeLists.txt b/Tests/VSGNUFortran/CMakeLists.txt index 422350a..229c315 100644 --- a/Tests/VSGNUFortran/CMakeLists.txt +++ b/Tests/VSGNUFortran/CMakeLists.txt @@ -17,23 +17,8 @@ if(CMAKE_CONFIGURATION_TYPES) endforeach() endif() -include(CMakeAddFortranSubdirectory) -# add the fortran subdirectory as a fortran project -# the subdir is fortran, the project is FortranHello -cmake_add_fortran_subdirectory(fortran - PROJECT FortranHello # project name in toplevel CMakeLists.txt - ARCHIVE_DIR ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY} - RUNTIME_DIR bin # ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} - LIBRARIES hello world # target libraries created - CMAKE_COMMAND_LINE - -DCMAKE_RUNTIME_OUTPUT_DIRECTORY=${CMAKE_RUNTIME_OUTPUT_DIRECTORY} - -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY=${CMAKE_ARCHIVE_OUTPUT_DIRECTORY} - -DCMAKE_LIBRARY_OUTPUT_DIRECTORY=${CMAKE_LIBRARY_OUTPUT_DIRECTORY} - LINK_LIBRARIES # link interface libraries - LINK_LIBS hello world # hello needs world to link - ) - -include_directories(${VSGNUFortran_BINARY_DIR}/fortran) +add_subdirectory(subdir) +include_directories(${VSGNUFortran_BINARY_DIR}/subdir/fortran) add_subdirectory(c_code) # use a cmake script to run the executable so that PATH # can be set with the MinGW/bin in it, and the fortran diff --git a/Tests/VSGNUFortran/subdir/CMakeLists.txt b/Tests/VSGNUFortran/subdir/CMakeLists.txt new file mode 100644 index 0000000..df018b3 --- /dev/null +++ b/Tests/VSGNUFortran/subdir/CMakeLists.txt @@ -0,0 +1,15 @@ +include(CMakeAddFortranSubdirectory) +# add the fortran subdirectory as a fortran project +# the subdir is fortran, the project is FortranHello +cmake_add_fortran_subdirectory(fortran + PROJECT FortranHello # project name in toplevel CMakeLists.txt + ARCHIVE_DIR ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY} + RUNTIME_DIR bin # ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} + LIBRARIES hello world # target libraries created + CMAKE_COMMAND_LINE + -DCMAKE_RUNTIME_OUTPUT_DIRECTORY=${CMAKE_RUNTIME_OUTPUT_DIRECTORY} + -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY=${CMAKE_ARCHIVE_OUTPUT_DIRECTORY} + -DCMAKE_LIBRARY_OUTPUT_DIRECTORY=${CMAKE_LIBRARY_OUTPUT_DIRECTORY} + LINK_LIBRARIES # link interface libraries + LINK_LIBS hello world # hello needs world to link + ) diff --git a/Tests/VSGNUFortran/fortran/CMakeLists.txt b/Tests/VSGNUFortran/subdir/fortran/CMakeLists.txt index 3ee1855..3ee1855 100644 --- a/Tests/VSGNUFortran/fortran/CMakeLists.txt +++ b/Tests/VSGNUFortran/subdir/fortran/CMakeLists.txt diff --git a/Tests/VSGNUFortran/fortran/hello.f b/Tests/VSGNUFortran/subdir/fortran/hello.f index e52119a..e52119a 100644 --- a/Tests/VSGNUFortran/fortran/hello.f +++ b/Tests/VSGNUFortran/subdir/fortran/hello.f diff --git a/Tests/VSGNUFortran/fortran/world.f b/Tests/VSGNUFortran/subdir/fortran/world.f index 0598eee..0598eee 100644 --- a/Tests/VSGNUFortran/fortran/world.f +++ b/Tests/VSGNUFortran/subdir/fortran/world.f |