Salome HOME
projects
/
modules
/
homard.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Copyright update 2022
[modules/homard.git]
/
src
/
HOMARDGUI
/
CMakeLists.txt
diff --git
a/src/HOMARDGUI/CMakeLists.txt
b/src/HOMARDGUI/CMakeLists.txt
index 7fc25dd3cc8fb65d680de7369d3b7f189d80b11f..b7c55c652de53c6f7e9f4fdeb9d1396a2f1fc9ed 100644
(file)
--- a/
src/HOMARDGUI/CMakeLists.txt
+++ b/
src/HOMARDGUI/CMakeLists.txt
@@
-1,4
+1,4
@@
-# Copyright (C) 2012-20
15
CEA/DEN, EDF R&D
+# Copyright (C) 2012-20
22
CEA/DEN, EDF R&D
#
# 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,19
+17,18
@@
# 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(UsePyQt
4
)
+INCLUDE(UseQtExt)
+INCLUDE(UsePyQt)
# --- options ---
# additional include directories
INCLUDE_DIRECTORIES(
${QT_INCLUDES}
# --- options ---
# additional include directories
INCLUDE_DIRECTORIES(
${QT_INCLUDES}
- ${
CAS_INCLUDE_DIRS
}
+ ${
OpenCASCADE_INCLUDE_DIR
}
${PYTHON_INCLUDE_DIRS}
${MEDFILE_INCLUDE_DIRS}
${HDF5_INCLUDE_DIRS}
${PYTHON_INCLUDE_DIRS}
${MEDFILE_INCLUDE_DIRS}
${HDF5_INCLUDE_DIRS}
- ${Boost_INCLUDE_DIRS}
${OMNIORB_INCLUDE_DIR}
${KERNEL_INCLUDE_DIRS}
${GUI_INCLUDE_DIRS}
${OMNIORB_INCLUDE_DIR}
${KERNEL_INCLUDE_DIRS}
${GUI_INCLUDE_DIRS}
@@
-40,13
+39,13
@@
INCLUDE_DIRECTORIES(
${PROJECT_BINARY_DIR}/adm_local/unix
${PROJECT_SOURCE_DIR}/src/HOMARD
${PROJECT_SOURCE_DIR}/src/HOMARD_I
${PROJECT_BINARY_DIR}/adm_local/unix
${PROJECT_SOURCE_DIR}/src/HOMARD
${PROJECT_SOURCE_DIR}/src/HOMARD_I
+ ${PROJECT_SOURCE_DIR}/src/FrontTrack
)
# additional preprocessor / compiler flags
ADD_DEFINITIONS(
)
# additional preprocessor / compiler flags
ADD_DEFINITIONS(
- ${BOOST_DEFINITIONS}
${OMNIORB_DEFINITIONS}
${OMNIORB_DEFINITIONS}
- ${
CAS
_DEFINITIONS}
+ ${
OpenCASCADE
_DEFINITIONS}
${KERNEL_DEFINITIONS}
)
${KERNEL_DEFINITIONS}
)
@@
-67,10
+66,11
@@
SET(_ts_RESOURCES
HOMARD_msg_en.ts
HOMARD_msg_fr.ts
HOMARD_msg_ja.ts
HOMARD_msg_en.ts
HOMARD_msg_fr.ts
HOMARD_msg_ja.ts
-)
+)
# resource files / to be processed by uic
SET(_uic_FILES
# resource files / to be processed by uic
SET(_uic_FILES
+ CreateBoundaryCAO.ui
CreateBoundaryAn.ui
CreateBoundaryDi.ui
CreateCase.ui
CreateBoundaryAn.ui
CreateBoundaryDi.ui
CreateCase.ui
@@
-90,9
+90,11
@@
SET(_uic_FILES
# header files / to be processed by moc
SET(_moc_HEADERS
HOMARDGUI.h
# header files / to be processed by moc
SET(_moc_HEADERS
HOMARDGUI.h
+ MonCreateBoundaryCAO.h
MonCreateBoundaryAn.h
MonCreateBoundaryAn.h
- MonEditBoundaryAn.h
MonCreateBoundaryDi.h
MonCreateBoundaryDi.h
+ MonEditBoundaryCAO.h
+ MonEditBoundaryAn.h
MonEditBoundaryDi.h
MonCreateCase.h
MonEditCase.h
MonEditBoundaryDi.h
MonCreateCase.h
MonEditCase.h
@@
-101,7
+103,9
@@
SET(_moc_HEADERS
MonCreateHypothesis.h
MonEditHypothesis.h
MonCreateListGroup.h
MonCreateHypothesis.h
MonEditHypothesis.h
MonCreateListGroup.h
+ MonCreateListGroupCAO.h
MonEditListGroup.h
MonEditListGroup.h
+ MonEditListGroupCAO.h
MonCreateIteration.h
MonEditIteration.h
MonPursueIteration.h
MonCreateIteration.h
MonEditIteration.h
MonPursueIteration.h
@@
-113,8
+117,8
@@
SET(_moc_HEADERS
)
# header files / uic wrappings
)
# header files / uic wrappings
-QT
4_WRAP_UI
(_uic_HEADERS ${_uic_FILES})
-
+QT
_WRAP_UIC
(_uic_HEADERS ${_uic_FILES})
+
# header files / static
SET(_other_HEADERS
HOMARDGUI_Utils.h
# header files / static
SET(_other_HEADERS
HOMARDGUI_Utils.h
@@
-128,22
+132,26
@@
SET(HOMARD_HEADERS ${_other_HEADERS} ${_moc_HEADERS} ${_uic_HEADERS})
# --- 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
HOMARDGUI.cxx
HOMARDGUI_Utils.cxx
# sources / static
SET(_other_SOURCES
HOMARDGUI.cxx
HOMARDGUI_Utils.cxx
+ MonCreateBoundaryCAO.cxx
MonCreateBoundaryAn.cxx
MonCreateBoundaryAn.cxx
- MonEditBoundaryAn.cxx
MonCreateBoundaryDi.cxx
MonCreateBoundaryDi.cxx
+ MonEditBoundaryCAO.cxx
+ MonEditBoundaryAn.cxx
MonEditBoundaryDi.cxx
MonCreateCase.cxx
MonEditCase.cxx
MonCreateHypothesis.cxx
MonEditHypothesis.cxx
MonCreateListGroup.cxx
MonEditBoundaryDi.cxx
MonCreateCase.cxx
MonEditCase.cxx
MonCreateHypothesis.cxx
MonEditHypothesis.cxx
MonCreateListGroup.cxx
+ MonCreateListGroupCAO.cxx
MonEditListGroup.cxx
MonEditListGroup.cxx
+ MonEditListGroupCAO.cxx
MonCreateIteration.cxx
MonEditIteration.cxx
MonPursueIteration.cxx
MonCreateIteration.cxx
MonEditIteration.cxx
MonPursueIteration.cxx
@@
-167,4
+175,4
@@
TARGET_LINK_LIBRARIES(HOMARD ${_link_LIBRARIES} )
INSTALL(TARGETS HOMARD EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
INSTALL(FILES ${HOMARD_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS})
INSTALL(TARGETS HOMARD EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
INSTALL(FILES ${HOMARD_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS})
-QT
4
_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_HOMARD_INSTALL_RES_DATA}")
+QT_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_HOMARD_INSTALL_RES_DATA}")