diff options
| author | Brad King <brad.king@kitware.com> | 2020-01-29 15:23:13 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-01-29 15:23:19 (GMT) |
| commit | 4e0d69c14285ef158c08e865290a2d2504e45794 (patch) | |
| tree | 55722acd321f561e70aa34d00ee77df8a6da6d75 /Modules | |
| parent | 0adc26659412eb0cb83a2080e819bc2bdc05d6af (diff) | |
| parent | a7b844d6d4135933808ff82ed149107f6e3e63cb (diff) | |
| download | CMake-4e0d69c14285ef158c08e865290a2d2504e45794.zip CMake-4e0d69c14285ef158c08e865290a2d2504e45794.tar.gz CMake-4e0d69c14285ef158c08e865290a2d2504e45794.tar.bz2 | |
Merge topic 'fortran-subdir-simplify'
a7b844d6d4 CMakeAddFortranSubdirectory: Simplfy logic to always build subdir
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4296
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CMakeAddFortranSubdirectory.cmake | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/Modules/CMakeAddFortranSubdirectory.cmake b/Modules/CMakeAddFortranSubdirectory.cmake index c02aa2c..69a8417 100644 --- a/Modules/CMakeAddFortranSubdirectory.cmake +++ b/Modules/CMakeAddFortranSubdirectory.cmake @@ -149,17 +149,9 @@ function(cmake_add_fortran_subdirectory subdir) -P ${build_dir}/config_mingw.cmake BUILD_COMMAND ${CMAKE_COMMAND} -P ${build_dir}/build_mingw.cmake + BUILD_ALWAYS 1 INSTALL_COMMAND "" ) - # make the external project always run make with each build - externalproject_add_step(${project_name}_build forcebuild - COMMAND ${CMAKE_COMMAND} - -E rm -f - ${CMAKE_CURRENT_BUILD_DIR}/${project_name}-prefix/src/${project_name}-stamp/${project_name}-build - DEPENDEES configure - DEPENDERS build - ALWAYS 1 - ) # create imported targets for all libraries foreach(lib ${libraries}) add_library(${lib} SHARED IMPORTED GLOBAL) |