FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added cmake_policy(SET CMP0043 NEW) usage when compiling against Qt5 as it was causing a warning we couldn't fix on the OSG side otherwise.

Browse Source 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14952 16af8721-9629-0410-8352-f15c8da7e697
This commit is contained in:
Robert Osfield 2015-07-14 13:26:40 +00:00
parent 4f1504e125
commit d85d98e916
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
CMakeLists.txt
View File

@ -692,11 +692,20 @@ IF(OSG_USE_QT AND NOT ANDROID)
IF (DESIRED_QT_VERSION) IF (DESIRED_QT_VERSION)
IF (DESIRED_QT_VERSION MATCHES 5) IF (DESIRED_QT_VERSION MATCHES 5)
FIND_PACKAGE(Qt5Widgets)
IF(COMMAND cmake_policy)
# Qt5 qt5_use_modules usage was causing "Policy CMP0043 is not set: Ignore COMPILE_DEFINITIONS_<Config> properties." warnings
cmake_policy(SET CMP0043 NEW)
ENDIF()
FIND_PACKAGE(Qt5Widgets)
ELSEIF (DESIRED_QT_VERSION MATCHES 4) ELSEIF (DESIRED_QT_VERSION MATCHES 4)
FIND_PACKAGE(Qt4) FIND_PACKAGE(Qt4)
ELSE() ELSE()
FIND_PACKAGE(Qt3) FIND_PACKAGE(Qt3)
ENDIF() ENDIF()
ELSE() ELSE()