Merge release-4-6 into master

[alexxy/gromacs.git] / src / tools / CMakeLists.txt

diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt
index dbf1014ee09c8ea4f43eca2033d31b4519cc7e68..a6162a43418cb81234447ee20f994c336d758292 100644 (file)
--- a/src/tools/CMakeLists.txt
+++ b/src/tools/CMakeLists.txt
@@ -34,7 +34,8 @@ add_library(gmxana
 
 
 target_link_libraries(gmxana libgromacs ${GSL_LIBRARIES})
-set_target_properties(gmxana PROPERTIES OUTPUT_NAME "gmxana${GMX_LIBS_SUFFIX}" SOVERSION ${SOVERSION} INSTALL_NAME_DIR "${LIB_INSTALL_DIR}")
+set_target_properties(gmxana PROPERTIES OUTPUT_NAME "gmxana${GMX_LIBS_SUFFIX}" SOVERSION ${SOVERSION} INSTALL_NAME_DIR "${LIB_INSTALL_DIR}"
+    COMPILE_FLAGS "${OpenMP_C_FLAGS}")
 
 # List of programs with single corresponding .c source file,
 # used to create build rules automatically.
@@ -66,7 +67,7 @@ foreach(TOOL ${GMX_TOOLS_PROGRAMS} ${GMX_TOOLS_PROGRAMS_NOT_FOR_INSTALLATION})
     if (NOT ${TOOL} STREQUAL "g_options")
         gmx_add_man_page(${TOOL})
     endif()
-    target_link_libraries(${TOOL} gmxana)
+    target_link_libraries(${TOOL} gmxana ${OpenMP_LINKER_FLAGS})
     set_target_properties(${TOOL} PROPERTIES OUTPUT_NAME "${TOOL}${GMX_BINARY_SUFFIX}")
 endforeach(TOOL ${GMX_TOOLS_PROGRAMS})