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

Merge branch 'develop' of bitbucket.org:k1jt/wsjtx into develop

Browse Source
This commit is contained in:
Joe Taylor 2020-05-07 14:36:27 -04:00
commit 101356c26c
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@ -10,15 +10,15 @@ if (APPLE)
# #
# otool -l <binary> | grep -A3 LC_VERSION_MIN_MACOSX # otool -l <binary> | grep -A3 LC_VERSION_MIN_MACOSX
# #
set (CMAKE_OSX_DEPLOYMENT_TARGET 10.10 set (CMAKE_OSX_DEPLOYMENT_TARGET 10.13
CACHE STRING "Earliest version of OS X supported CACHE STRING "Earliest version of OS X supported
Earliest version we can support with Qt 5.8, C++11 & libc++ is 10.10. Earliest version we can support with Qt 5.14, C++11 & libc++ is 10.13.
Do not override this if you intend to build an official deployable installer.") Do not override this if you intend to build an official deployable installer.")
set (CMAKE_OSX_SYSROOT /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk set (CMAKE_OSX_SYSROOT /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk
CACHE STRING "Mac OS X SDK to build with CACHE STRING "Mac OS X SDK to build with
Change this to the newest SDK available that you can install on your system (10.11 preferred). Change this to the newest SDK available that you can install on your system (10.14 preferred).
Do not override this if you intend to build an official deployable installer.") Do not override this if you intend to build an official deployable installer.")
endif (APPLE) endif (APPLE)
@ -1632,6 +1632,7 @@ if (NOT is_debug_build)
PATTERN "*minimal*${CMAKE_SHARED_LIBRARY_SUFFIX}" EXCLUDE PATTERN "*minimal*${CMAKE_SHARED_LIBRARY_SUFFIX}" EXCLUDE
PATTERN "*offscreen*${CMAKE_SHARED_LIBRARY_SUFFIX}" EXCLUDE PATTERN "*offscreen*${CMAKE_SHARED_LIBRARY_SUFFIX}" EXCLUDE
PATTERN "*quick*${CMAKE_SHARED_LIBRARY_SUFFIX}" EXCLUDE PATTERN "*quick*${CMAKE_SHARED_LIBRARY_SUFFIX}" EXCLUDE
PATTERN "*webgl*${CMAKE_SHARED_LIBRARY_SUFFIX}" EXCLUDE
PATTERN "*_debug${CMAKE_SHARED_LIBRARY_SUFFIX}" EXCLUDE PATTERN "*_debug${CMAKE_SHARED_LIBRARY_SUFFIX}" EXCLUDE
) )
install ( install (