diff options
| author | Kyle Edwards <kyle.edwards@kitware.com> | 2019-12-12 19:00:30 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-12-12 14:00:41 -0500 |
| commit | 966a9eece32f55fab479ea6997dea68e1c2d6212 (patch) | |
| tree | fcb8a3bfdcfb02ffab961e2e773da98ae333488b /Modules/CMakeAddFortranSubdirectory.cmake | |
| parent | f6e29e04051326861afc0b4fc98a77e20b366ff0 (diff) | |
| parent | 24fdd51f4503ccee33c07881cc8dd487cdc8b347 (diff) | |
| download | cmake-966a9eece32f55fab479ea6997dea68e1c2d6212.tar.gz | |
Merge topic 'function-var-current'
24fdd51f45 Refactor: Replace CMAKE_CURRENT_LIST_DIR with CMAKE_CURRENT_FUNCTION_LIST_DIR
90e3e2a777 cmFunctionCommand: Introduce `CMAKE_CURRENT_FUNCTION*` variables
dd54290dab Refactor: Modernize `function` command
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !4000
Diffstat (limited to 'Modules/CMakeAddFortranSubdirectory.cmake')
| -rw-r--r-- | Modules/CMakeAddFortranSubdirectory.cmake | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Modules/CMakeAddFortranSubdirectory.cmake b/Modules/CMakeAddFortranSubdirectory.cmake index 09e739dd71..c02aa2cc2f 100644 --- a/Modules/CMakeAddFortranSubdirectory.cmake +++ b/Modules/CMakeAddFortranSubdirectory.cmake @@ -43,7 +43,6 @@ future version that supports installation of the external project binaries during ``make install``. #]=======================================================================] -set(_MS_MINGW_SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}) include(CheckLanguage) include(ExternalProject) @@ -87,11 +86,11 @@ function(_setup_mingw_config_and_build source_dir build_dir) file(TO_NATIVE_PATH "${MINGW_PATH}" MINGW_PATH) string(REPLACE "\\" "\\\\" MINGW_PATH "${MINGW_PATH}") configure_file( - ${_MS_MINGW_SOURCE_DIR}/CMakeAddFortranSubdirectory/config_mingw.cmake.in + ${CMAKE_CURRENT_FUNCTION_LIST_DIR}/CMakeAddFortranSubdirectory/config_mingw.cmake.in ${build_dir}/config_mingw.cmake @ONLY) configure_file( - ${_MS_MINGW_SOURCE_DIR}/CMakeAddFortranSubdirectory/build_mingw.cmake.in + ${CMAKE_CURRENT_FUNCTION_LIST_DIR}/CMakeAddFortranSubdirectory/build_mingw.cmake.in ${build_dir}/build_mingw.cmake @ONLY) endfunction() |