-
Notifications
You must be signed in to change notification settings - Fork 6.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[qt5-base, qt5-imageformat] fix issues on osx (#9705)
* [qt5-imageformats] freeglut is not a dependency on osx * [qt5-base] fontconfig can require iconv on linux and osx * include the jasper fix to get CI coverage? * trying to get ci coverage for qt on osx * Revert "trying to get ci coverage for qt on osx" This reverts commit 8b9b188. * apply the correct ci hack * fix wrapper to include macosx debug suffix * update baseline * first try to fix the Qt5 cmake configs at the root. * fix missing backslash * fix plugin patch * fix qt config patch * remove 90% of fixcmake.py * update baseline * experimental removal of fixcmake.py and dll copying into tools/qt5/bin * fix experimental dll copying. * fix static windows builds * fix static builds * fix plugin copy * add quotes around configuration to make it work * remove dll debug messages * note about the cmake fix * revert fontconfig changes on linux. Make qt.conf relative and not absolute * make qt.conf relative * trying to fix ogre osx ci regression * fix silly path error * Revert "trying to fix ogre osx ci regression" This reverts commit 708d825. * add ogre:x64-osx=fail to CI baseline * retry on osx * fix configure error. since in qt5-base everything is in the package directory and not in the installed * revert change to ci.baseline * update ci baseline * bump control * update baseline * ws change to osg-qt * reset ci baseline to upstream/master * update baseline * fix osg-qt? * skip ms-angle on osx and linux since the normal angle port should be used! * update ci baseline * try adding fontconfig manually * update ci baseline to remove osg-qt for the time being * remove manual library.
- Loading branch information
Showing
13 changed files
with
180 additions
and
137 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| Source: osg-qt | ||
| Version: Qt4 | ||
| Description: osgQt - Qt project for making use of OpenSceneGraph(OSG) | ||
| Version: Qt4-1 | ||
| Description: osgQt - Qt project for making use of OpenSceneGraph(OSG) | ||
| Build-Depends: osg, protobuf, qt5-base |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,78 @@ | ||
| diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in | ||
| index c72989288..a88234dca 100644 | ||
| --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in | ||
| +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in | ||
| @@ -53,7 +53,11 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI | ||
| set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) | ||
|
|
||
| !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) | ||
| - set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") | ||
| + if(\"${Configuration}\" STREQUAL \"DEBUG\") | ||
| + set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") | ||
| + else() | ||
| + set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") | ||
| + endif() | ||
| !!ELSE | ||
| set(imported_location \"$${CMAKE_DLL_DIR}${LIB_LOCATION}\") | ||
| !!ENDIF | ||
| @@ -69,8 +73,12 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI | ||
| ) | ||
|
|
||
| !!IF !isEmpty(CMAKE_WINDOWS_BUILD) | ||
| !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) | ||
| - set(imported_implib \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") | ||
| + if(\"${Configuration}\" STREQUAL \"DEBUG\") | ||
| + set(imported_implib \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") | ||
| + else() | ||
| + set(imported_implib \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") | ||
| + endif() | ||
| !!ELSE | ||
| set(imported_implib \"IMPORTED_IMPLIB_${Configuration}\" \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") | ||
| !!ENDIF | ||
| @@ -270,9 +278,8 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) | ||
| !!ENDIF // CMAKE_STATIC_WINDOWS_BUILD | ||
|
|
||
| !!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD) | ||
| -!!IF isEmpty(CMAKE_DEBUG_TYPE) | ||
| !!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD) | ||
| !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) | ||
| - if (EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) | ||
| + if (EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) | ||
| !!ELSE // CMAKE_LIB_DIR_IS_ABSOLUTE | ||
| if (EXISTS \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) | ||
| @@ -281,20 +288,19 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) | ||
| !!ELSE // CMAKE_STATIC_WINDOWS_BUILD | ||
| if (EXISTS | ||
| !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) | ||
| - \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" | ||
| + \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" | ||
| !!ELSE | ||
| \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" | ||
| !!ENDIF | ||
| AND EXISTS | ||
| !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) | ||
| - \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) | ||
| + \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) | ||
| !!ELSE | ||
| \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) | ||
| !!ENDIF | ||
| _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) | ||
| !!ENDIF // CMAKE_STATIC_WINDOWS_BUILD | ||
| endif() | ||
| -!!ENDIF // CMAKE_DEBUG_TYPE | ||
| !!ENDIF // CMAKE_FIND_OTHER_LIBRARY_BUILD | ||
|
|
||
| !!ENDIF // CMAKE_RELEASE_TYPE | ||
| @@ -347,7 +353,12 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) | ||
| set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) | ||
|
|
||
| !!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE) | ||
| + if(\"${Configuration}\" STREQUAL \"DEBUG\") | ||
| + set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\") | ||
| + else() | ||
| set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\") | ||
| + endif() | ||
| + | ||
| !!ELSE | ||
| set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\") | ||
| !!ENDIF |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| diff --git a/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in b/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in | ||
| index 5baf0fdb1..185abfffd 100644 | ||
| --- a/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in | ||
| +++ b/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in | ||
| @@ -1,11 +1,11 @@ | ||
|
|
||
| add_library(Qt5::$$CMAKE_PLUGIN_NAME MODULE IMPORTED) | ||
|
|
||
| -!!IF !isEmpty(CMAKE_RELEASE_TYPE) | ||
| -_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_LOCATION_RELEASE}\") | ||
| -!!ENDIF | ||
| -!!IF !isEmpty(CMAKE_DEBUG_TYPE) | ||
| -_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_LOCATION_DEBUG}\") | ||
| -!!ENDIF | ||
| +if(EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_PLUGIN_DIR}$${CMAKE_PLUGIN_LOCATION_RELEASE}\") | ||
| + _populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_LOCATION_RELEASE}\") | ||
| +endif() | ||
| +if(EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/debug/$${CMAKE_PLUGIN_DIR}$${CMAKE_PLUGIN_LOCATION_DEBUG}\") | ||
| + _populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_LOCATION_DEBUG}\") | ||
| +endif() | ||
|
|
||
| list(APPEND Qt5$${CMAKE_MODULE_NAME}_PLUGINS Qt5::$$CMAKE_PLUGIN_NAME) |
Oops, something went wrong.