diff options
author | Jonathan Peyton <jonathan.l.peyton@intel.com> | 2015-08-31 15:52:32 +0000 |
---|---|---|
committer | Jonathan Peyton <jonathan.l.peyton@intel.com> | 2015-08-31 15:52:32 +0000 |
commit | afa300606a9e6ec61599000b42982df02c1bb84b (patch) | |
tree | 3339ec096a69f6fc7a22f8564c370b2ce770be5b /openmp/runtime/src | |
parent | bf89109013bc51868173de3d8c71d28989afd39e (diff) | |
download | bcm5719-llvm-afa300606a9e6ec61599000b42982df02c1bb84b.tar.gz bcm5719-llvm-afa300606a9e6ec61599000b42982df02c1bb84b.zip |
Follow up to r246426 (Break Fortran Module Files build)
The CMAKE_CURRENT_BINARY_DIR is only necessary on the DEPENDS part of
the add_custom_command to build the Fortran Modules.
llvm-svn: 246448
Diffstat (limited to 'openmp/runtime/src')
-rw-r--r-- | openmp/runtime/src/CMakeLists.txt | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/openmp/runtime/src/CMakeLists.txt b/openmp/runtime/src/CMakeLists.txt index 097c35cd446..ce6b2600a62 100644 --- a/openmp/runtime/src/CMakeLists.txt +++ b/openmp/runtime/src/CMakeLists.txt @@ -207,20 +207,21 @@ endif() # Building the Fortran module files # One compilation step creates both omp_lib.mod and omp_lib_kinds.mod if(${LIBOMP_FORTRAN_MODULES}) - configure_file(${LIBOMP_INC_DIR}/omp_lib.h.var ${CMAKE_CURRENT_BINARY_DIR}/omp_lib.h @ONLY) - configure_file(${LIBOMP_INC_DIR}/omp_lib.f.var ${CMAKE_CURRENT_BINARY_DIR}/omp_lib.f @ONLY) - configure_file(${LIBOMP_INC_DIR}/omp_lib.f90.var ${CMAKE_CURRENT_BINARY_DIR}/omp_lib.f90 @ONLY) + configure_file(${LIBOMP_INC_DIR}/omp_lib.h.var omp_lib.h @ONLY) + configure_file(${LIBOMP_INC_DIR}/omp_lib.f.var omp_lib.f @ONLY) + configure_file(${LIBOMP_INC_DIR}/omp_lib.f90.var omp_lib.f90 @ONLY) add_custom_target(libomp-mod ALL DEPENDS omp_lib.mod omp_lib_kinds.mod) libomp_get_fflags(LIBOMP_CONFIGURED_FFLAGS) if(CMAKE_Fortran_COMPILER_SUPPORTS_F90) - set(LIBOMP_FORTRAN_SOURCE_FILE ${CMAKE_CURRENT_BINARY_DIR}/omp_lib.f90) + set(LIBOMP_FORTRAN_SOURCE_FILE omp_lib.f90) else() - set(LIBOMP_FORTRAN_SOURCE_FILE ${CMAKE_CURRENT_BINARY_DIR}/omp_lib.f) + set(LIBOMP_FORTRAN_SOURCE_FILE omp_lib.f) endif() add_custom_command( OUTPUT omp_lib.mod omp_lib_kinds.mod COMMAND ${CMAKE_Fortran_COMPILER} -c ${LIBOMP_CONFIGURED_FFLAGS} ${LIBOMP_FORTRAN_SOURCE_FILE} - DEPENDS ${LIBOMP_FORTRAN_SOURCE_FILE} ${CMAKE_CURRENT_BINARY_DIR}/omp_lib.h + DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${LIBOMP_FORTRAN_SOURCE_FILE} + ${CMAKE_CURRENT_BINARY_DIR}/omp_lib.h ) set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES omp_lib${CMAKE_C_OUTPUT_EXTENSION}) endif() |