summaryrefslogtreecommitdiffstats
path: root/Modules/CMakeAddFortranSubdirectory
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2011-12-15 15:19:46 (GMT)
committerBrad King <brad.king@kitware.com>2012-02-09 13:34:06 (GMT)
commite4ae038f5d9f0fa14d63f9eaea71e0466dc86619 (patch)
tree05f0de9ddf1038cc168b1f8dcef2ffb3c5cf40d2 /Modules/CMakeAddFortranSubdirectory
parent538c3452ad660a45c3d6ca32f8c09ee7c93a8b84 (diff)
downloadCMake-e4ae038f5d9f0fa14d63f9eaea71e0466dc86619.zip
CMake-e4ae038f5d9f0fa14d63f9eaea71e0466dc86619.tar.gz
CMake-e4ae038f5d9f0fa14d63f9eaea71e0466dc86619.tar.bz2
CMakeAddFortranSubdirectory: Allow full paths to directories
Fix the implementation to allow full paths with spaces. Change the interpretation of relative paths to be with respect to the current binary directory. This matches the convention used in ExternalProject. Test both full and relative paths in the VSGNUFortran test.
Diffstat (limited to 'Modules/CMakeAddFortranSubdirectory')
-rw-r--r--Modules/CMakeAddFortranSubdirectory/config_mingw.cmake.in3
1 files changed, 2 insertions, 1 deletions
diff --git a/Modules/CMakeAddFortranSubdirectory/config_mingw.cmake.in b/Modules/CMakeAddFortranSubdirectory/config_mingw.cmake.in
index 96141da..97f6769 100644
--- a/Modules/CMakeAddFortranSubdirectory/config_mingw.cmake.in
+++ b/Modules/CMakeAddFortranSubdirectory/config_mingw.cmake.in
@@ -1,8 +1,9 @@
set(ENV{PATH} "@MINGW_PATH@\;$ENV{PATH}")
+set(CMAKE_COMMAND_LINE "@ARGS_CMAKE_COMMAND_LINE@")
execute_process(
COMMAND "@CMAKE_COMMAND@" "-GMinGW Makefiles"
-DCMAKE_Fortran_COMPILER:PATH=@MINGW_GFORTRAN@
-DBUILD_SHARED_LIBS=ON
-DCMAKE_GNUtoMS=ON
- @ARGS_CMAKE_COMMAND_LINE@
+ ${CMAKE_COMMAND_LINE}
"@source_dir@")