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
Merge branch 'V8_4_BR'
[modules/gui.git]
/
src
/
GLViewer
/
CMakeLists.txt
diff --git
a/src/GLViewer/CMakeLists.txt
b/src/GLViewer/CMakeLists.txt
index 9d0e36c57c3044fd629632512d2a27f053b287f7..be67c0169b3c4a45f0439b350736959c4a58ca96 100755
(executable)
--- a/
src/GLViewer/CMakeLists.txt
+++ b/
src/GLViewer/CMakeLists.txt
@@
-22,17
+22,17
@@
INCLUDE(UseQtExt)
# --- options ---
INCLUDE_DIRECTORIES(
# --- options ---
INCLUDE_DIRECTORIES(
- ${
CAS_INCLUDE_DIRS
}
+ ${
OpenCASCADE_INCLUDE_DIR
}
${QT_INCLUDES}
${PROJECT_SOURCE_DIR}/src/Qtx
${PROJECT_SOURCE_DIR}/src/SUIT
)
# additional preprocessor / compiler flags
${QT_INCLUDES}
${PROJECT_SOURCE_DIR}/src/Qtx
${PROJECT_SOURCE_DIR}/src/SUIT
)
# additional preprocessor / compiler flags
-ADD_DEFINITIONS(${
CAS
_DEFINITIONS} ${QT_DEFINITIONS})
+ADD_DEFINITIONS(${
OpenCASCADE
_DEFINITIONS} ${QT_DEFINITIONS})
# libraries to link to
# libraries to link to
-SET(_link_LIBRARIES ${QT_LIBRARIES} ${
CAS_KERNEL
} ${OPENGL_LIBRARIES} qtx suit)
+SET(_link_LIBRARIES ${QT_LIBRARIES} ${
OpenCASCADE_FoundationClasses_LIBRARIES
} ${OPENGL_LIBRARIES} qtx suit)
IF(NOT (WIN32 OR APPLE))
LIST(APPEND _link_LIBRARIES Xmu)
ENDIF()
IF(NOT (WIN32 OR APPLE))
LIST(APPEND _link_LIBRARIES Xmu)
ENDIF()