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

Adjust CMake script for the latest Mac OS X Xcode tools

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx-1.6@6644 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Bill Somerville 2016-04-24 12:57:07 +00:00
parent a096247817
commit ea1053be88
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
CMakeLists.txt
View File

@ -852,10 +852,10 @@ 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)
@ -896,10 +896,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