w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-11-04 05:50:31 -05:00
Code Issues Packages Projects Releases Wiki Activity

Use CMake generator expressions to add OpenMP flags more accurately

Browse Source 
The latest Clang shipped with Apple Xcode errors on unrecognized flags
that gcc/g++ accept. By using generator expressions the OpenMP flag
is now only applied to Fortran compiles when needed on Mac. Note that
this is necessary since the Apple Clang does not support OpenMP so we
have to hack the link to support OpenMP in jt9 by mixing gfortran OpenMP
object code with Clang/Clang++ object code.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6566 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Bill Somerville 2016-04-01 10:57:05 +00:00
parent cbc08a662e
commit 61eb897a89
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
CMakeLists.txt
View File

@ -222,6 +222,11 @@ set (wsjt_qtmm_CXXSRCS
Audio/BWFFile.cpp Audio/BWFFile.cpp
) )
set (jt9_FSRCS
lib/jt9.f90
lib/jt9a.f90
)
set (jt9_CXXSRCS set (jt9_CXXSRCS
lib/ipcomm.cpp lib/ipcomm.cpp
) )
@ -917,9 +922,9 @@ if (${OPENMP_FOUND} OR APPLE)
# On Mac we don't have working OpenMP support in the C/C++ # On Mac we don't have working OpenMP support in the C/C++
# compilers so we have to manually set the correct flags to get # compilers so we have to manually set the correct flags to get
# OpenMP support in jt9. # OpenMP support in jt9.
set_target_properties (wsjt_fort_omp target_compile_options (wsjt_fort_omp
PROPERTIES PRIVATE
COMPILE_FLAGS "-fopenmp" # assumes GNU style Fortran compiler $<$<COMPILE_LANGUAGE:Fortran>:-fopenmp> # assumes GNU style Fortran compiler
) )
endif (APPLE) endif (APPLE)
endif (${OPENMP_FOUND} OR APPLE) endif (${OPENMP_FOUND} OR APPLE)
@ -962,7 +967,7 @@ target_link_libraries (jt4code wsjt_fort wsjt_cxx)
add_executable (jt65 lib/jt65.f90 lib/jt65_test.f90 wsjtx.rc) add_executable (jt65 lib/jt65.f90 lib/jt65_test.f90 wsjtx.rc)
target_link_libraries (jt65 wsjt_fort wsjt_cxx) target_link_libraries (jt65 wsjt_fort wsjt_cxx)
add_executable (jt9 lib/jt9.f90 lib/jt9a.f90 ${jt9_CXXSRCS} wsjtx.rc) add_executable (jt9 ${jt9_FSRCS} ${jt9_CXXSRCS} wsjtx.rc)
if (${OPENMP_FOUND} OR APPLE) if (${OPENMP_FOUND} OR APPLE)
if (APPLE) if (APPLE)
# On Mac we don't have working OpenMP support in the C/C++ # On Mac we don't have working OpenMP support in the C/C++
@ -970,10 +975,13 @@ if (${OPENMP_FOUND} OR APPLE)
# and libraries to get OpenMP support in jt9. # and libraries to get OpenMP support in jt9.
set_target_properties (jt9 set_target_properties (jt9
PROPERTIES PROPERTIES
COMPILE_FLAGS "-fopenmp" # assumes GNU style Fortran compiler
Fortran_MODULE_DIRECTORY ${CMAKE_BINARY_DIR}/fortran_modules_omp Fortran_MODULE_DIRECTORY ${CMAKE_BINARY_DIR}/fortran_modules_omp
LINK_LIBRARIES "gomp;gcc_s.1" # assume GNU libgcc OpenMP LINK_LIBRARIES "gomp;gcc_s.1" # assume GNU libgcc OpenMP
) )
target_compile_options (jt9
PRIVATE
$<$<COMPILE_LANGUAGE:Fortran>:-fopenmp> # assumes GNU style Fortran compiler
)
else (APPLE) else (APPLE)
set_target_properties (jt9 set_target_properties (jt9
PROPERTIES PROPERTIES