Commit 8e949df8 by Jan Möbius

Tagged 3.2



git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/tags/OpenMesh-3.2@1110 fdac6126-5c0c-442c-9429-916003d36597
parents a9b6357f 809ee0de
Pipeline #31 skipped in 0 seconds
......@@ -7,7 +7,7 @@
<!-- --------------------------------------------------------------------- -->
<tr valign=top><td><b>3.2</b> (2014/07/17,Rev.1104)</td><td>
<tr valign=top><td><b>3.2</b> (2014/07/18,Rev.1107)</td><td>
<b>Core</b>
<ul>
......
......@@ -213,12 +213,11 @@ macro (acg_qt5)
endif()
endif(Qt5Core_FOUND AND WIN32)
find_package (Qt5Widgets QUIET)
find_package (Qt5Gui QUIET)
find_package (Qt5OpenGL QUIET)
if (Qt5Core_FOUND AND Qt5Widgets_FOUND AND Qt5Gui_FOUND AND Qt5OpenGL_FOUND)
if (Qt5Core_FOUND AND Qt5Gui_FOUND AND Qt5OpenGL_FOUND)
set (QT5_FOUND TRUE)
endif()
......@@ -251,11 +250,9 @@ macro (acg_qt5)
set (CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
include_directories(${Qt5Core_INCLUDE_DIRS})
include_directories(${Qt5Widgets_INCLUDE_DIRS})
include_directories(${Qt5Gui_INCLUDE_DIRS})
include_directories(${Qt5OpenGL_INCLUDE_DIRS})
add_definitions(${Qt5Core_DEFINITIONS})
add_definitions(${Qt5Widgets_DEFINITIONS})
add_definitions(${Qt5Gui_DEFINITIONS})
add_definitions(${Qt5OpenGL_DEFINITIONS})
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment