Skip to content

Commit b63902d

Browse files
committed
Don't make clean files generated at config time
- Fixes #31 - Also don't write config time files to source tree (cherry picked from commit 31d033f)
1 parent cda59e9 commit b63902d

File tree

2 files changed

+16
-14
lines changed

2 files changed

+16
-14
lines changed
Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
set(include_directory ${CMAKE_CURRENT_SOURCE_DIR}/include-files)
22
set(library_directory ${CMAKE_CURRENT_SOURCE_DIR}/library)
3+
set(config_directory ${CMAKE_CURRENT_BINARY_DIR}/library)
34

45
if ("${CMAKE_Fortran_COMPILER_ID}" MATCHES "Cray")
5-
configure_file(${include_directory}/cray_capabilities.txt ${library_directory}/compiler_capabilities.txt COPYONLY)
6+
configure_file(${include_directory}/cray_capabilities.txt ${config_directory}/compiler_capabilities.txt COPYONLY)
67
elseif ("${CMAKE_Fortran_COMPILER_ID}" MATCHES "Intel")
7-
configure_file(${include_directory}/intel_capabilities.txt ${library_directory}/compiler_capabilities.txt COPYONLY)
8+
configure_file(${include_directory}/intel_capabilities.txt ${config_directory}/compiler_capabilities.txt COPYONLY)
89
elseif ("${CMAKE_Fortran_COMPILER_ID}" MATCHES "GNU")
9-
configure_file(${include_directory}/gfortran_capabilities.txt ${library_directory}/compiler_capabilities.txt COPYONLY)
10+
configure_file(${include_directory}/gfortran_capabilities.txt ${config_directory}/compiler_capabilities.txt COPYONLY)
1011
elseif ("${CMAKE_Fortran_COMPILER_ID}" MATCHES "VisualAge|XL")
11-
configure_file(${include_directory}/ibm_capabilities.txt ${library_directory}/compiler_capabilities.txt COPYONLY)
12+
configure_file(${include_directory}/ibm_capabilities.txt ${config_directory}/compiler_capabilities.txt COPYONLY)
1213
elseif ("${CMAKE_Fortran_COMPILER_ID}" MATCHES "PGI")
13-
configure_file(${include_directory}/portlandgroup_capabilities.txt ${library_directory}/compiler_capabilities.txt COPYONLY)
14+
configure_file(${include_directory}/portlandgroup_capabilities.txt ${config_directory}/compiler_capabilities.txt COPYONLY)
1415
elseif ("${CMAKE_Fortran_COMPILER_ID}" MATCHES "NAG")
15-
configure_file(${include_directory}/nag_capabilities.txt ${library_directory}/compiler_capabilities.txt COPYONLY)
16+
configure_file(${include_directory}/nag_capabilities.txt ${config_directory}/compiler_capabilities.txt COPYONLY)
1617
else()
1718
message ("Unknown Fortran compiler: ${CMAKE_Fortran_COMPILER_ID}")
1819
endif()
19-
set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${CMAKE_CURRENT_SOURCE_DIR}/compiler_capabilities.txt;${library_directory}/compiler_capabilities.txt")
2020

2121
add_executable(coarray_burgers_pde
2222
main.F90
@@ -27,3 +27,4 @@ add_executable(coarray_burgers_pde
2727
${library_directory}/co_object_interface.F90
2828
)
2929
target_link_libraries(coarray_burgers_pde OpenCoarrays)
30+
target_include_directories(coarray_burgers_pde PRIVATE ${config_directory})
Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
set(include_directory ${CMAKE_CURRENT_SOURCE_DIR}/../../integration/pde_solvers/include-files)
22
set(library_directory ${CMAKE_CURRENT_SOURCE_DIR}/../../integration/pde_solvers/library)
3+
set(config_directory ${CMAKE_CURRENT_BINARY_DIR}/../../integration/pde_solvers/library)
34

45
if ("${CMAKE_Fortran_COMPILER_ID}" MATCHES "Cray")
5-
configure_file(${include_directory}/cray_capabilities.txt ${library_directory}/compiler_capabilities.txt COPYONLY)
6+
configure_file(${include_directory}/cray_capabilities.txt ${config_directory}/compiler_capabilities.txt COPYONLY)
67
elseif ("${CMAKE_Fortran_COMPILER_ID}" MATCHES "Intel")
7-
configure_file(${include_directory}/intel_capabilities.txt ${library_directory}/compiler_capabilities.txt COPYONLY)
8+
configure_file(${include_directory}/intel_capabilities.txt ${config_directory}/compiler_capabilities.txt COPYONLY)
89
elseif ("${CMAKE_Fortran_COMPILER_ID}" MATCHES "GNU")
9-
configure_file(${include_directory}/gfortran_capabilities.txt ${library_directory}/compiler_capabilities.txt COPYONLY)
10+
configure_file(${include_directory}/gfortran_capabilities.txt ${config_directory}/compiler_capabilities.txt COPYONLY)
1011
elseif ("${CMAKE_Fortran_COMPILER_ID}" MATCHES "VisualAge|XL")
11-
configure_file(${include_directory}/ibm_capabilities.txt ${library_directory}/compiler_capabilities.txt COPYONLY)
12+
configure_file(${include_directory}/ibm_capabilities.txt ${config_directory}/compiler_capabilities.txt COPYONLY)
1213
elseif ("${CMAKE_Fortran_COMPILER_ID}" MATCHES "PGI")
13-
configure_file(${include_directory}/portlandgroup_capabilities.txt ${library_directory}/compiler_capabilities.txt COPYONLY)
14+
configure_file(${include_directory}/portlandgroup_capabilities.txt ${config_directory}/compiler_capabilities.txt COPYONLY)
1415
elseif ("${CMAKE_Fortran_COMPILER_ID}" MATCHES "NAG")
15-
configure_file(${include_directory}/nag_capabilities.txt ${library_directory}/compiler_capabilities.txt COPYONLY)
16+
configure_file(${include_directory}/nag_capabilities.txt ${config_directory}/compiler_capabilities.txt COPYONLY)
1617
else()
1718
message ("Unknown Fortran compiler: ${CMAKE_Fortran_COMPILER_ID}")
1819
endif()
19-
set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${library_directory}/compiler_capabilities.txt")
2020

2121
add_executable( mpi_burgers_pde
2222
main.F90
@@ -30,3 +30,4 @@ add_executable( mpi_burgers_pde
3030
input_file.F90
3131
periodic_2nd_order.F90
3232
)
33+
target_include_directories(mpi_burgers_pde PRIVATE ${config_directory})

0 commit comments

Comments
 (0)