bos #26457 Factorization of ORB initialization

[modules/gui.git] / src / Session / CMakeLists.txt

diff --git a/src/Session/CMakeLists.txt b/src/Session/CMakeLists.txt
old mode 100755 (executable)
new mode 100644 (file)
index 29c25ae..fe934c2
--- a/src/Session/CMakeLists.txt
+++ b/src/Session/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2014  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2012-2021  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
@@ -17,6 +17,8 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
+INCLUDE(UseQtExt)
+
 # --- options ---
 
 # additional include directories
@@ -24,14 +26,21 @@ INCLUDE_DIRECTORIES(
   ${QT_INCLUDES}
   ${Boost_INCLUDE_DIRS}
   ${PYTHON_INCLUDE_DIRS}
-  ${CAS_INCLUDE_DIRS}
+  ${OpenCASCADE_INCLUDE_DIR}
   ${OMNIORB_INCLUDE_DIR}
   ${PTHREAD_INCLUDE_DIR}
   ${PROJECT_BINARY_DIR}
+  ${PROJECT_BINARY_DIR}/idl
   ${PROJECT_SOURCE_DIR}/src/Qtx
   ${PROJECT_SOURCE_DIR}/src/SUIT
   ${PROJECT_SOURCE_DIR}/src/Event
   ${PROJECT_SOURCE_DIR}/src/Style
+  ${PROJECT_SOURCE_DIR}/src/SUIT
+  ${PROJECT_SOURCE_DIR}/src/STD
+  ${PROJECT_SOURCE_DIR}/src/CAM
+  ${PROJECT_SOURCE_DIR}/src/OBJECT
+  ${PROJECT_SOURCE_DIR}/src/LightApp
+  ${PROJECT_SOURCE_DIR}/src/SalomeApp
 )
 
 # additional preprocessor / compiler flags
@@ -39,18 +48,16 @@ ADD_DEFINITIONS(
   ${QT_DEFINITIONS}
   ${BOOST_DEFINITIONS}
   ${PYTHON_DEFINITIONS}
-  ${CAS_DEFINITIONS}
+  ${OpenCASCADE_DEFINITIONS}
   ${OMNIORB_DEFINITIONS}
 )
-IF(ENABLE_TESTRECORDER)
-  ADD_DEFINITIONS("-DENABLE_TESTRECORDER ${TESTRECORDER_DEFINITIONS}")
-ENDIF()
 
 # libraries to link to
 SET(_link_LIBRARIES
   ${QT_LIBRARIES}
-  ${CAS_KERNEL}
+  ${OpenCASCADE_FoundationClasses_LIBRARIES}
   ${OMNIORB_LIBRARIES}
+  ${KERNEL_ArgvKeeper}
   ${KERNEL_SalomeNS}
   ${KERNEL_SalomeLifeCycleCORBA}
   ${KERNEL_OpUtil}
@@ -63,11 +70,8 @@ SET(_link_LIBRARIES
   ${KERNEL_SalomeLauncher}
   ${KERNEL_Registry}
   ${KERNEL_SALOMEBasics}
-  qtx suit Event SalomeStyle SalomeIDLGUI
+  qtx suit Event SalomeStyle SalomeApp SalomeIDLGUI
 )
-IF(ENABLE_TESTRECORDER)
-  LIST(APPEND _link_LIBRARIES ${TESTRECORDER_LIBS})
-ENDIF()
 
 # --- headers ---
 
@@ -78,6 +82,15 @@ SET(SalomeSession_HEADERS
   Session_ServerLauncher.hxx
   Session_ServerThread.hxx
   Session_Session_i.hxx
+  Session_Promises.hxx
+  Session_NS_wrapper.hxx
+)
+
+# --- resources ---
+
+# resource files / to be processed by lrelease
+SET(_ts_RESOURCES
+  resources/Session_msg_fr.ts
 )
 
 # --- sources ---
@@ -88,6 +101,8 @@ SET(SalomeSession_SOURCES
   Session_ServerLauncher.cxx
   Session_ServerThread.cxx
   Session_Session_i.cxx
+  Session_Promises.cxx
+  Session_NS_wrapper.cxx
 )
 
 # --- rules ---
@@ -96,8 +111,17 @@ ADD_LIBRARY(SalomeSession ${SalomeSession_SOURCES})
 TARGET_LINK_LIBRARIES(SalomeSession ${_link_LIBRARIES})
 INSTALL(TARGETS SalomeSession EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) 
 
-ADD_EXECUTABLE(SALOME_Session_Server SALOME_Session_Server.cxx)
+ADD_EXECUTABLE(SALOME_Session_Server SALOME_Session_Server_With_Server.cxx)
 TARGET_LINK_LIBRARIES(SALOME_Session_Server ${_link_LIBRARIES} SalomeSession)
 INSTALL(TARGETS SALOME_Session_Server EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_BINS})
 
+ADD_EXECUTABLE(SALOME_Session_Server_No_Server SALOME_Session_Server_No_Server.cxx)
+TARGET_LINK_LIBRARIES(SALOME_Session_Server_No_Server ${_link_LIBRARIES} SalomeSession)
+INSTALL(TARGETS SALOME_Session_Server_No_Server EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_BINS})
+
+add_executable(salome2810 salome2810.cxx)
+target_link_libraries(salome2810 ${QT_LIBRARIES})
+install(TARGETS salome2810 DESTINATION ${SALOME_INSTALL_BINS})
+
 INSTALL(FILES ${SalomeSession_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS})
+QT_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_GUI_INSTALL_RES_DATA}")