Salome HOME
projects
/
modules
/
paravis.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge Qt5 porting.
[modules/paravis.git]
/
test
/
standalone
/
gui
/
CMakeLists.txt
diff --git
a/test/standalone/gui/CMakeLists.txt
b/test/standalone/gui/CMakeLists.txt
index 295798519288524871b7697b56426c9b4b8c067f..91b5642796b21c1c755f82accf2506f71f18b8bc 100644
(file)
--- a/
test/standalone/gui/CMakeLists.txt
+++ b/
test/standalone/gui/CMakeLists.txt
@@
-18,6
+18,8
@@
#
# Author: Adrien Bruneton (CEA)
#
# Author: Adrien Bruneton (CEA)
+INCLUDE(UseQtExt)
+
SET(pl_HEADERS
PLMainWindow.hxx
PLViewTab.hxx
SET(pl_HEADERS
PLMainWindow.hxx
PLViewTab.hxx
@@
-47,7
+49,6
@@
SET(CMAKE_INCLUDE_CURRENT_DIR ON)
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
INCLUDE_DIRECTORIES(${PARAVIEW_INCLUDE_DIRS})
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
INCLUDE_DIRECTORIES(${PARAVIEW_INCLUDE_DIRS})
-INCLUDE(${QT_USE_FILE})
ADD_DEFINITIONS(${QT_DEFINITIONS})
# Generate resources that will embedded
ADD_DEFINITIONS(${QT_DEFINITIONS})
# Generate resources that will embedded
@@
-59,11
+60,11
@@
GENERATE_QT_RESOURCE_FROM_FILES(
"/LightPara/Configuration"
"${PROJECT_SOURCE_DIR}/gui/xml/ParaViewReaders.xml")
"/LightPara/Configuration"
"${PROJECT_SOURCE_DIR}/gui/xml/ParaViewReaders.xml")
-QT
4
_ADD_RESOURCES(rcs_sources
+QT_ADD_RESOURCES(rcs_sources
${ui_resources}
)
${ui_resources}
)
-QT
4_WRAP_UI
(pl_FORMS_HEADERS ${pl_FORMS})
-QT
4_WRAP_CPP
(pl_HEADERS_MOC ${pl_HEADERS})
+QT
_WRAP_UIC
(pl_FORMS_HEADERS ${pl_FORMS})
+QT
_WRAP_MOC
(pl_HEADERS_MOC ${pl_HEADERS})
ADD_EXECUTABLE(paraLight
${pl_SOURCES}
ADD_EXECUTABLE(paraLight
${pl_SOURCES}