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 5794cbca70866d9eaf00f02cba039e54f9891e4c..be67c0169b3c4a45f0439b350736959c4a58ca96 100755
(executable)
--- a/
src/GLViewer/CMakeLists.txt
+++ b/
src/GLViewer/CMakeLists.txt
@@
-1,4
+1,4
@@
-# Copyright (C) 2012-201
4
CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2012-201
6
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
@@
-17,23
+17,23
@@
# 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 ---
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)
-IF(NOT
WIN32
)
+SET(_link_LIBRARIES ${QT_LIBRARIES} ${
OpenCASCADE_FoundationClasses_LIBRARIES
} ${OPENGL_LIBRARIES} qtx suit)
+IF(NOT
(WIN32 OR APPLE)
)
LIST(APPEND _link_LIBRARIES Xmu)
ENDIF()
LIST(APPEND _link_LIBRARIES Xmu)
ENDIF()
@@
-104,7
+104,7
@@
SET(_other_RESOURCES
# --- sources ---
# sources / moc wrappings
# --- sources ---
# sources / moc wrappings
-QT
4_WRAP_CPP
(_moc_SOURCES ${_moc_HEADERS})
+QT
_WRAP_MOC
(_moc_SOURCES ${_moc_HEADERS})
# sources / static
SET(_other_SOURCES
# sources / static
SET(_other_SOURCES
@@
-144,6
+144,6
@@
TARGET_LINK_LIBRARIES(GLViewer ${_link_LIBRARIES})
INSTALL(TARGETS GLViewer EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
INSTALL(FILES ${GLViewer_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS})
INSTALL(TARGETS GLViewer EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
INSTALL(FILES ${GLViewer_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS})
-QT4_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})