diff options
author | Magnus Lundborg <lundborg.magnus@gmail.com> | 2013-10-15 11:32:17 (GMT) |
---|---|---|
committer | Magnus Lundborg <lundborg.magnus@gmail.com> | 2013-10-15 11:32:17 (GMT) |
commit | 004217257ab666cff30da8ee9f36f051180f89c0 (patch) | |
tree | 6f6159e64f6ae706f70eb1a0d7104ae73cdfa6ae | |
parent | ec586d3aa8f9f7a23f7d8ae70a0b0578ce2fb86e (diff) |
Only compile openmp code if explicitly requested.
-rw-r--r-- | src/tests/CMakeLists.txt | 21 | ||||
-rw-r--r-- | src/tests/md_openmp.c | 4 | ||||
-rw-r--r-- | src/tests/md_openmp_util.c | 4 | ||||
-rw-r--r-- | src/tests/tng_parallel_read.c | 4 |
4 files changed, 25 insertions, 8 deletions
diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt index a3aa1a0..486f135 100644 --- a/src/tests/CMakeLists.txt +++ b/src/tests/CMakeLists.txt @@ -24,13 +24,16 @@ if(TNG_BUILD_TEST) endif() if(TNG_BUILD_EXAMPLES) - if(OPENMP_FOUND) + if(TNG_USE_OPENMP AND OPENMP_FOUND) + add_executable(md_openmp md_openmp.c) target_link_libraries(md_openmp tng_io ${OpenMP_LIBS}) if(UNIX) target_link_libraries(md_openmp m) endif() set_property(TARGET md_openmp PROPERTY RUNTIME_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/examples) + set_property(TARGET md_openmp APPEND PROPERTY COMPILE_DEFINITIONS TNG_BUILD_OPENMP_EXAMPLES) + add_executable(md_openmp_util md_openmp_util.c) target_link_libraries(md_openmp_util tng_io ${OpenMP_LIBS}) @@ -38,6 +41,15 @@ if(TNG_BUILD_EXAMPLES) target_link_libraries(md_openmp_util m) endif() set_property(TARGET md_openmp_util PROPERTY RUNTIME_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/examples) + set_property(TARGET md_openmp_util APPEND PROPERTY COMPILE_DEFINITIONS TNG_BUILD_OPENMP_EXAMPLES) + + add_executable(tng_parallel_read tng_parallel_read.c) + target_link_libraries(tng_parallel_read tng_io) + if(UNIX) + target_link_libraries(tng_parallel_read m) + endif() + set_property(TARGET tng_parallel_read PROPERTY RUNTIME_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/examples) + set_property(TARGET tng_parallel_read APPEND PROPERTY COMPILE_DEFINITIONS TNG_BUILD_OPENMP_EXAMPLES) endif() add_executable(tng_io_read_pos tng_io_read_pos.c) @@ -54,13 +66,6 @@ if(TNG_BUILD_EXAMPLES) endif() set_property(TARGET tng_io_read_pos_util PROPERTY RUNTIME_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/examples) - add_executable(tng_parallel_read tng_parallel_read.c) - target_link_libraries(tng_parallel_read tng_io) - if(UNIX) - target_link_libraries(tng_parallel_read m) - endif() - set_property(TARGET tng_parallel_read PROPERTY RUNTIME_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/examples) - if(TNG_BUILD_FORTRAN) # This does not work due to a bug in CMake. Remove lines below if no fortran compiler is found. enable_language(Fortran OPTIONAL) diff --git a/src/tests/md_openmp.c b/src/tests/md_openmp.c index ff426c9..f9942ba 100644 --- a/src/tests/md_openmp.c +++ b/src/tests/md_openmp.c @@ -1,3 +1,5 @@ +#ifdef TNG_BUILD_OPENMP_EXAMPLES + # include <stdlib.h> # include <stdio.h> # include <time.h> @@ -835,3 +837,5 @@ void update ( int np, int nd, double pos[], double vel[], double f[], return; } + +#endif diff --git a/src/tests/md_openmp_util.c b/src/tests/md_openmp_util.c index 815ca4f..e883c65 100644 --- a/src/tests/md_openmp_util.c +++ b/src/tests/md_openmp_util.c @@ -1,3 +1,5 @@ +#ifdef TNG_BUILD_OPENMP_EXAMPLES + # include <stdlib.h> # include <stdio.h> # include <time.h> @@ -757,3 +759,5 @@ void update ( int np, int nd, float pos[], float vel[], float f[], return; } + +#endif diff --git a/src/tests/tng_parallel_read.c b/src/tests/tng_parallel_read.c index 17417d9..6e6994e 100644 --- a/src/tests/tng_parallel_read.c +++ b/src/tests/tng_parallel_read.c @@ -1,3 +1,5 @@ +#ifdef TNG_BUILD_OPENMP_EXAMPLES + /* This code is part of the tng binary trajectory format. * * VERSION 1.0 @@ -181,3 +183,5 @@ default(none) return(0); } + +#endif |