Commit 6f850247 authored by Matthias Möller's avatar Matthias Möller

- type fix

- add missed AND
- disable not aviable compiler parameter for msvc

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@17177 383ad7c9-94d9-4d36-a494-682f7c89f535
parent 30234be3
...@@ -212,7 +212,7 @@ macro (acg_qt5) ...@@ -212,7 +212,7 @@ macro (acg_qt5)
#set (QT_MIN_VERSION ${ARGN}) #set (QT_MIN_VERSION ${ARGN})
#for custom installation of qt5, dont use any of these variables #for custom installation of qt5, dont use any of these variables
set (QT5_INSTALL_PATH "" CACHE String "Path to qt5 lib and include folder") set (QT5_INSTALL_PATH "" CACHE PATH "Path to qt5 lib and include folder")
set (CMAKE_PREFIX_PATH ${QT5_INSTALL_PATH}) set (CMAKE_PREFIX_PATH ${QT5_INSTALL_PATH})
set (CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) set (CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
...@@ -235,7 +235,7 @@ macro (acg_qt5) ...@@ -235,7 +235,7 @@ macro (acg_qt5)
find_package (Qt5PrintSupport REQUIRED) find_package (Qt5PrintSupport REQUIRED)
set (QT5_FOUND ${Qt5Core_FOUND} AND ${Qt5Declarative} ${Qt5Widgets_FOUND} set (QT5_FOUND ${Qt5Core_FOUND} AND ${Qt5Declarative} AND ${Qt5Widgets_FOUND}
AND ${Qt5Gui_FOUND} AND ${Qt5OpenGL_FOUND} AND ${Qt5Network_FOUND} AND ${Qt5Gui_FOUND} AND ${Qt5OpenGL_FOUND} AND ${Qt5Network_FOUND}
AND ${Qt5Script_FOUND} AND ${Qt5ScriptTools_FOUND} AND ${Qt5Sql_FOUND} AND ${Qt5Script_FOUND} AND ${Qt5ScriptTools_FOUND} AND ${Qt5Sql_FOUND}
AND ${Qt5Xml_FOUND} AND ${Qt5XmlPatterns_FOUND} AND ${Qt5Help_FOUND} AND ${Qt5Xml_FOUND} AND ${Qt5XmlPatterns_FOUND} AND ${Qt5Help_FOUND}
...@@ -274,8 +274,9 @@ macro (acg_qt5) ...@@ -274,8 +274,9 @@ macro (acg_qt5)
add_definitions(${Qt5UiTools_DEFINITIONS}) add_definitions(${Qt5UiTools_DEFINITIONS})
add_definitions(${Qt5Concurrent_DEFINITIONS}) add_definitions(${Qt5Concurrent_DEFINITIONS})
add_definitions(${Qt5PrintSupport_DEFINITIONS}) add_definitions(${Qt5PrintSupport_DEFINITIONS})
if ( NOT MSVC )
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
endif()
set (QT_LIBRARIES ${QT_LIBRARIES} ${Qt5Core_LIBRARIES} ${Qt5Declarative_LIBRARIES} ${Qt5Widgets_LIBRARIES} set (QT_LIBRARIES ${QT_LIBRARIES} ${Qt5Core_LIBRARIES} ${Qt5Declarative_LIBRARIES} ${Qt5Widgets_LIBRARIES}
${Qt5Gui_LIBRARIES} ${Qt5OpenGL_LIBRARIES} ${Qt5Network_LIBRARIES} ${Qt5Gui_LIBRARIES} ${Qt5OpenGL_LIBRARIES} ${Qt5Network_LIBRARIES}
......
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 to comment