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
Remove deprecated staff
[modules/gui.git]
/
src
/
LightApp
/
CMakeLists.txt
diff --git
a/src/LightApp/CMakeLists.txt
b/src/LightApp/CMakeLists.txt
old mode 100755
(executable)
new mode 100644
(file)
index
770f969
..
374d057
--- a/
src/LightApp/CMakeLists.txt
+++ b/
src/LightApp/CMakeLists.txt
@@
-1,4
+1,4
@@
-# Copyright (C) 2012-201
6
CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2012-201
9
CEA/DEN, EDF R&D, OPEN CASCADE
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
@@
-23,7
+23,7
@@
INCLUDE(UseQtExt)
# additional include directories
INCLUDE_DIRECTORIES(
# additional include directories
INCLUDE_DIRECTORIES(
- ${
CAS_INCLUDE_DIRS
}
+ ${
OpenCASCADE_INCLUDE_DIR
}
${QT_INCLUDES}
${HDF5_INCLUDE_DIRS}
${PTHREAD_INCLUDE_DIR}
${QT_INCLUDES}
${HDF5_INCLUDE_DIRS}
${PTHREAD_INCLUDE_DIR}
@@
-81,14
+81,14
@@
ENDIF()
IF(SALOME_USE_PYCONSOLE)
INCLUDE_DIRECTORIES(
${PYTHON_INCLUDE_DIRS}
IF(SALOME_USE_PYCONSOLE)
INCLUDE_DIRECTORIES(
${PYTHON_INCLUDE_DIRS}
- ${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()
# additional preprocessor / compiler flags
${PROJECT_SOURCE_DIR}/src/SUITApp
)
ENDIF()
# additional preprocessor / compiler flags
-ADD_DEFINITIONS(${
CAS
_DEFINITIONS} ${QT_DEFINITIONS} ${HDF5_DEFINITIONS})
+ADD_DEFINITIONS(${
OpenCASCADE
_DEFINITIONS} ${QT_DEFINITIONS} ${HDF5_DEFINITIONS})
IF(SALOME_USE_PLOT2DVIEWER)
ADD_DEFINITIONS(${QWT_DEFINITIONS})
ENDIF()
IF(SALOME_USE_PLOT2DVIEWER)
ADD_DEFINITIONS(${QWT_DEFINITIONS})
ENDIF()
@@
-98,7
+98,7
@@
ENDIF()
# libraries to link to
SET(_link_LIBRARIES
# libraries to link to
SET(_link_LIBRARIES
- ${
CAS_KERNEL
}
+ ${
OpenCASCADE_FoundationClasses_LIBRARIES
}
${QT_LIBRARIES}
${HDF5_LIBRARIES}
CASCatch qtx suit std SalomeStyle SalomePrs CAM LogWindow ObjBrowser Event
${QT_LIBRARIES}
${HDF5_LIBRARIES}
CASCatch qtx suit std SalomeStyle SalomePrs CAM LogWindow ObjBrowser Event
@@
-227,7
+227,8
@@
SET(_other_RESOURCES
resources/icon_module.png
resources/icon_module_big.png
resources/icon_select.png
resources/icon_module.png
resources/icon_module_big.png
resources/icon_select.png
- resources/LightApp.ini
+ resources/icon_earth.png
+ resources/icon_life_ring.png
resources/LightApp.xml
)
resources/LightApp.xml
)