From 61eb897a892c2e351e00553744fbe252662a098d Mon Sep 17 00:00:00 2001
From: Bill Somerville <g4wjs@classdesign.com>
Date: Fri, 1 Apr 2016 10:57:05 +0000
Subject: [PATCH] Use CMake generator expressions to add OpenMP flags more
 accurately

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
---
 CMakeLists.txt | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 03dc1a977..59e46dfe1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -222,6 +222,11 @@ set (wsjt_qtmm_CXXSRCS
   Audio/BWFFile.cpp
   )
 
+set (jt9_FSRCS
+  lib/jt9.f90
+  lib/jt9a.f90
+  )
+
 set (jt9_CXXSRCS
   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++
     # compilers so  we have to manually  set the correct flags  to get
     # OpenMP support in jt9.
-    set_target_properties (wsjt_fort_omp
-      PROPERTIES
-      COMPILE_FLAGS "-fopenmp"	# assumes GNU style Fortran compiler
+    target_compile_options (wsjt_fort_omp
+      PRIVATE
+      $<$<COMPILE_LANGUAGE:Fortran>:-fopenmp>   # assumes GNU style Fortran compiler
       )
   endif (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)
 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 (APPLE)
     # 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.
     set_target_properties (jt9
       PROPERTIES
-      COMPILE_FLAGS "-fopenmp"	# assumes GNU style Fortran compiler
       Fortran_MODULE_DIRECTORY ${CMAKE_BINARY_DIR}/fortran_modules_omp
       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)
     set_target_properties (jt9
       PROPERTIES