Salome HOME
projects
/
modules
/
shaper.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add Sphinx documentation
[modules/shaper.git]
/
CMakeCommon
/
FindQt.cmake
diff --git
a/CMakeCommon/FindQt.cmake
b/CMakeCommon/FindQt.cmake
index 7c6d8c61e7dfbe7bdb296110920562258dda1d00..389f01f5c1192467e7090180f951e35e5699f3e0 100644
(file)
--- a/
CMakeCommon/FindQt.cmake
+++ b/
CMakeCommon/FindQt.cmake
@@
-1,18
+1,15
@@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.11)
+## Copyright (C) 2014-20xx CEA/DEN, EDF R&D
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8.10)
IF(WIN32)
IF(WIN32)
- SET(Q_WS_WIN ON)
SET(QT_USE_QTMAIN ON)
SET(QT_USE_QTMAIN ON)
-ELSE()
- SET(Q_WS_X11 ON)
ENDIF()
# Widgets finds its own dependencies (QtGui and QtCore).
FIND_PACKAGE(Qt4 REQUIRED)
ENDIF()
# Widgets finds its own dependencies (QtGui and QtCore).
FIND_PACKAGE(Qt4 REQUIRED)
-IF(Qt4_FOUND)
- SET(QT_VERSION_STRING "${QT_VERSION_MAJOR}.${QT_VERSION_MINOR}.${QT_VERSION_PATCH}")
- MESSAGE(STATUS "Found Qt version: " ${QT_VERSION_STRING})
+IF(NOT QT4_FOUND)
+ MESSAGE(FATAL_ERROR "Qt not found.")
ENDIF()
INCLUDE(${QT_USE_FILE})
ENDIF()
INCLUDE(${QT_USE_FILE})
@@
-26,4
+23,4
@@
ADD_DEFINITIONS(${QT_DEFINITIONS})
# Executables fail to build with Qt 5 in the default configuration
# without -fPIE. We add that here.
# Executables fail to build with Qt 5 in the default configuration
# without -fPIE. We add that here.
-#SET(CMAKE_CXX_FLAGS "${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
\ No newline at end of file
+#SET(CMAKE_CXX_FLAGS "${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")