From a735ed8487bfed370bc17a99824b03cbc16cafa7 Mon Sep 17 00:00:00 2001 From: Bill Somerville Date: Mon, 2 Feb 2015 14:57:43 +0000 Subject: [PATCH] Only install jt9_omp if it has been built git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4925 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- CMakeLists.txt | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 48d4fa090..4ab55a935 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -711,7 +711,7 @@ if (${OPENMP_FOUND}) file (MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/fortran_modules_omp) set_target_properties (wsjt_omp PROPERTIES - COMPILE_FLAGS ${OpenMP_C_FLAGS} + COMPILE_FLAGS "${OpenMP_C_FLAGS}" Fortran_MODULE_DIRECTORY ${CMAKE_BINARY_DIR}/fortran_modules_omp ) endif (${OPENMP_FOUND}) @@ -743,7 +743,7 @@ if (${OPENMP_FOUND}) endif (WIN32) set_target_properties (jt9_omp PROPERTIES - COMPILE_FLAGS ${OpenMP_C_FLAGS} + COMPILE_FLAGS "${OpenMP_C_FLAGS}" Fortran_MODULE_DIRECTORY ${CMAKE_BINARY_DIR}/fortran_modules_omp LINK_FLAGS "${OpenMP_C_FLAGS} ${_extra_omp_link_flags}" ) @@ -820,11 +820,18 @@ install (TARGETS wsjtx BUNDLE DESTINATION . COMPONENT runtime ) -install (TARGETS jt9 jt65code jt9code jt9_omp +install (TARGETS jt9 jt65code jt9code RUNTIME DESTINATION ${WSJT_BIN_DESTINATION} COMPONENT runtime BUNDLE DESTINATION ${WSJT_BIN_DESTINATION} COMPONENT runtime ) +if (${OPENMP_FOUND}) + install (TARGETS jt9_omp + RUNTIME DESTINATION ${WSJT_BIN_DESTINATION} COMPONENT runtime + BUNDLE DESTINATION ${WSJT_BIN_DESTINATION} COMPONENT runtime + ) +endif (${OPENMP_FOUND}) + if (WSJT_INCLUDE_KVASD) install (PROGRAMS ${CMAKE_BINARY_DIR}/${KVASD_BINARY}