Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Merge pull request #3790 from dakcarto/qt5py3-mac-fixes
Qt5py3 Mac fixes
- Loading branch information
Showing
with
116 additions
and 65 deletions.
- +0 −4 CMakeLists.txt
- +42 −0 cmake/CMakeDebugMacros.cmake
- +3 −0 cmake/FindPyQt5.cmake
- +28 −23 cmake/FindPythonLibrary.cmake
- +1 −1 cmake/FindQCA.cmake
- +8 −4 cmake/QCAMacros.cmake
- +4 −4 src/app/qgisapp.cpp
- +1 −1 src/app/qgisapp.h
- +2 −0 src/app/qgsidentifyresultsdialog.cpp
- +1 −1 src/auth/identcert/qgsauthidentcertmethod.cpp
- +1 −1 src/auth/pkipaths/qgsauthpkipathsmethod.cpp
- +1 −1 src/auth/pkipkcs12/qgsauthpkcs12method.cpp
- +3 −4 src/core/auth/qgsauthconfig.cpp
- +2 −2 src/core/auth/qgsauthconfig.h
- +4 −4 src/core/auth/qgsauthmanager.cpp
- +4 −4 src/core/auth/qgsauthmanager.h
- +3 −3 src/core/qgsnetworkaccessmanager.cpp
- +1 −1 src/gui/auth/qgsauthcertificateinfo.h
- +3 −3 src/gui/qgsfiledownloader.cpp
- +2 −2 src/gui/qgsfiledownloader.h
- +2 −2 tests/src/gui/testqgsfiledownloader.cpp
There are no files selected for viewing
| @@ -0,0 +1,42 @@ | ||
| # Macros/functions for debugging CMake | ||
| # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | ||
| # | ||
| # Copyright (c) 2016, Larry Shaffer, <lshaffer (at) boundlessgeo (dot) com>> | ||
| # Redistribution and use is allowed according to the terms of the BSD license. | ||
| # For details see the accompanying COPYING-CMAKE-SCRIPTS file. | ||
|
|
||
|
|
||
| # Dump current CMake variables to file | ||
| # | ||
| # Usage: | ||
| # INCLUDE(CMakeDebugMacros) | ||
| # DUMP_CMAKE_VARS() or DUMP_CMAKE_VARS("regex") | ||
| # | ||
| # regex: optional ARGV0 regular expression for filtering output variable names | ||
| # | ||
| # Outputs the result relative to the current CMake file being processed and | ||
| # writes to a file with name "<file-basename>_cmake-vars.txt" to the current | ||
| # build (binary) directory | ||
| # | ||
| function(DUMP_CMAKE_VARS) | ||
|
|
||
| get_filename_component(_basename ${CMAKE_CURRENT_LIST_FILE} NAME_WE) | ||
| set(_out "${CMAKE_CURRENT_BINARY_DIR}/${_basename}_cmake-vars.txt") | ||
|
|
||
| set(_cmake_vars "") | ||
| get_cmake_property(_varNames VARIABLES) | ||
| foreach(_varName ${_varNames}) | ||
| if(ARGV0) | ||
| string(REGEX MATCH "${ARGV0}" _match "${_varName}") | ||
| if(_match) | ||
| set(_cmake_vars "${_cmake_vars}\n\n${_varName}=${${_varName}}") | ||
| endif() | ||
| else() | ||
| set(_cmake_vars "${_cmake_vars}\n\n${_varName}=${${_varName}}") | ||
| endif() | ||
| endforeach() | ||
|
|
||
| message(STATUS "Dumping current CMake variables to ...\n ${_out}") | ||
| file(WRITE "${_out}" "${_cmake_vars}") | ||
|
|
||
| endfunction(DUMP_CMAKE_VARS) |
Oops, something went wrong.