w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-30 08:08:39 -05:00
Code Issues Packages Projects Releases Wiki Activity

Only install jt9_omp if it has been built

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4925 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Bill Somerville 2015-02-02 14:57:43 +00:00
parent b16d510b0d
commit 19c4d67b29
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
CMakeLists.txt
View File

@ -711,7 +711,7 @@ if (${OPENMP_FOUND})
file (MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/fortran_modules_omp) file (MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/fortran_modules_omp)
set_target_properties (wsjt_omp set_target_properties (wsjt_omp
PROPERTIES PROPERTIES
COMPILE_FLAGS ${OpenMP_C_FLAGS} COMPILE_FLAGS "${OpenMP_C_FLAGS}"
Fortran_MODULE_DIRECTORY ${CMAKE_BINARY_DIR}/fortran_modules_omp Fortran_MODULE_DIRECTORY ${CMAKE_BINARY_DIR}/fortran_modules_omp
) )
endif (${OPENMP_FOUND}) endif (${OPENMP_FOUND})
@ -743,7 +743,7 @@ if (${OPENMP_FOUND})
endif (WIN32) endif (WIN32)
set_target_properties (jt9_omp set_target_properties (jt9_omp
PROPERTIES PROPERTIES
COMPILE_FLAGS ${OpenMP_C_FLAGS} COMPILE_FLAGS "${OpenMP_C_FLAGS}"
Fortran_MODULE_DIRECTORY ${CMAKE_BINARY_DIR}/fortran_modules_omp Fortran_MODULE_DIRECTORY ${CMAKE_BINARY_DIR}/fortran_modules_omp
LINK_FLAGS "${OpenMP_C_FLAGS} ${_extra_omp_link_flags}" LINK_FLAGS "${OpenMP_C_FLAGS} ${_extra_omp_link_flags}"
) )
@ -820,11 +820,18 @@ install (TARGETS wsjtx
BUNDLE DESTINATION . COMPONENT runtime BUNDLE DESTINATION . COMPONENT runtime
) )
install (TARGETS jt9 jt65code jt9code jt9_omp install (TARGETS jt9 jt65code jt9code
RUNTIME DESTINATION ${WSJT_BIN_DESTINATION} COMPONENT runtime RUNTIME DESTINATION ${WSJT_BIN_DESTINATION} COMPONENT runtime
BUNDLE 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) if (WSJT_INCLUDE_KVASD)
install (PROGRAMS install (PROGRAMS
${CMAKE_BINARY_DIR}/${KVASD_BINARY} ${CMAKE_BINARY_DIR}/${KVASD_BINARY}