Salome HOME
projects
/
modules
/
gui.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
IPAL54049: Operations on multiple study objects are very long
[modules/gui.git]
/
src
/
LightApp
/
CMakeLists.txt
diff --git
a/src/LightApp/CMakeLists.txt
b/src/LightApp/CMakeLists.txt
index f37381f249b66f5acf00a556e0fd7a87b8ee89c2..de54a19705659c81979052dd887409832b6f64d5 100755
(executable)
--- a/
src/LightApp/CMakeLists.txt
+++ b/
src/LightApp/CMakeLists.txt
@@
-17,7
+17,7
@@
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
-INCLUDE(UseQt
4
Ext)
+INCLUDE(UseQtExt)
# --- options ---
# --- options ---
@@
-81,9
+81,8
@@
ENDIF()
IF(SALOME_USE_PYCONSOLE)
INCLUDE_DIRECTORIES(
${PYTHON_INCLUDE_DIRS}
IF(SALOME_USE_PYCONSOLE)
INCLUDE_DIRECTORIES(
${PYTHON_INCLUDE_DIRS}
- ${PROJECT_SOURCE_DIR}/src/SalomePyConsole
- ${PROJECT_SOURCE_DIR}/src/PyConsole
- ${PROJECT_SOURCE_DIR}/src/PyInterp
+ ${PROJECT_SOURCE_DIR}/tools/PyConsole/src
+ ${PROJECT_SOURCE_DIR}/tools/PyInterp/src
${PROJECT_SOURCE_DIR}/src/SUITApp
)
ENDIF()
${PROJECT_SOURCE_DIR}/src/SUITApp
)
ENDIF()
@@
-142,7
+141,7
@@
IF(SALOME_USE_PVVIEWER)
LIST(APPEND _link_LIBRARIES PVViewer)
ENDIF()
IF(SALOME_USE_PYCONSOLE)
LIST(APPEND _link_LIBRARIES PVViewer)
ENDIF()
IF(SALOME_USE_PYCONSOLE)
- LIST(APPEND _link_LIBRARIES PyInterp
Salome
PyConsole SUITApp)
+ LIST(APPEND _link_LIBRARIES PyInterp PyConsole SUITApp)
ENDIF()
# --- headers ---
ENDIF()
# --- headers ---
@@
-184,6
+183,9
@@
IF(SALOME_USE_VTKVIEWER)
LIST(APPEND _moc_HEADERS LightApp_VTKSelector.h)
ENDIF()
ENDIF()
LIST(APPEND _moc_HEADERS LightApp_VTKSelector.h)
ENDIF()
ENDIF()
+IF(SALOME_USE_PYCONSOLE)
+ LIST(APPEND _moc_HEADERS LightApp_PyEditor.h)
+ENDIF()
# header files / no moc processing
SET(_other_HEADERS
# header files / no moc processing
SET(_other_HEADERS
@@
-194,14
+196,12
@@
SET(_other_HEADERS
LightApp_Displayer.h
LightApp_Driver.h
LightApp_EventFilter.h
LightApp_Displayer.h
LightApp_Driver.h
LightApp_EventFilter.h
+ LightApp_FileValidator.h
LightApp_FullScreenHelper.h
LightApp_HDFDriver.h
LightApp_Selection.h
LightApp_UpdateFlags.h
)
LightApp_FullScreenHelper.h
LightApp_HDFDriver.h
LightApp_Selection.h
LightApp_UpdateFlags.h
)
-IF(SALOME_USE_PYCONSOLE)
- LIST(APPEND _other_HEADERS LightApp_PyInterp.h)
-ENDIF()
# header files / to install
SET(LightApp_HEADERS ${_moc_HEADERS} ${_other_HEADERS})
# header files / to install
SET(LightApp_HEADERS ${_moc_HEADERS} ${_other_HEADERS})
@@
-233,11
+233,11
@@
SET(_other_RESOURCES
# --- sources ---
# --- sources ---
-# sources / rcc wrappings
-QT4_ADD_RESOURCES(_rcc_SOURCES ${_rcc_RESOURCES})
-
# sources / moc wrappings
# sources / moc wrappings
-QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS})
+QT_WRAP_MOC(_moc_SOURCES ${_moc_HEADERS})
+
+# sources / rcc wrappings
+QT_ADD_RESOURCES(_rcc_SOURCES ${_rcc_RESOURCES})
# sources / static
SET(_other_SOURCES
# sources / static
SET(_other_SOURCES
@@
-251,6
+251,7
@@
SET(_other_SOURCES
LightApp_Displayer.cxx
LightApp_Driver.cxx
LightApp_EventFilter.cxx
LightApp_Displayer.cxx
LightApp_Driver.cxx
LightApp_EventFilter.cxx
+ LightApp_FileValidator.cxx
LightApp_FullScreenHelper.cxx
LightApp_HDFDriver.cxx
LightApp_Module.cxx
LightApp_FullScreenHelper.cxx
LightApp_HDFDriver.cxx
LightApp_Module.cxx
@@
-286,7
+287,7
@@
IF(SALOME_USE_VTKVIEWER)
ENDIF()
ENDIF()
IF(SALOME_USE_PYCONSOLE)
ENDIF()
ENDIF()
IF(SALOME_USE_PYCONSOLE)
- LIST(APPEND _other_SOURCES LightApp_Py
Interp
.cxx)
+ LIST(APPEND _other_SOURCES LightApp_Py
Editor
.cxx)
ENDIF()
# sources / to compile
ENDIF()
# sources / to compile
@@
-299,6
+300,6
@@
TARGET_LINK_LIBRARIES(LightApp ${_link_LIBRARIES})
INSTALL(TARGETS LightApp EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
INSTALL(FILES ${LightApp_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS})
INSTALL(TARGETS LightApp EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
INSTALL(FILES ${LightApp_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS})
-QT
4
_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_GUI_INSTALL_RES_DATA}")
+QT_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_GUI_INSTALL_RES_DATA}")
INSTALL(FILES ${_other_RESOURCES} DESTINATION ${SALOME_GUI_INSTALL_RES_DATA})
INSTALL(FILES ${_other_RESOURCES} DESTINATION ${SALOME_GUI_INSTALL_RES_DATA})