Second integration of PV3D viewer:

[modules/gui.git] / src / PVServerService / ServiceLoader / CMakeLists.txt

diff --git a/src/PVServerService/ServiceLoader/CMakeLists.txt b/src/PVServerService/ServiceLoader/CMakeLists.txt
index a9a6a5b23bfc15e88c56aac6d7dfbb2ad3ea1ff6..dd8539581f6fdc64c917cac604bf4279f07ac104 100644 (file)
--- a/src/PVServerService/ServiceLoader/CMakeLists.txt
+++ b/src/PVServerService/ServiceLoader/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2010-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2010-2024  CEA, EDF, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -21,7 +21,6 @@ INCLUDE(${SWIG_USE_FILE})
 
 INCLUDE_DIRECTORIES(
   ${CMAKE_CURRENT_SOURCE_DIR}
-  ${CMAKE_CURRENT_SOURCE_DIR}/..
   ${OMNIORB_INCLUDE_DIR}
   ${KERNEL_INCLUDE_DIRS}
   )
@@ -33,9 +32,9 @@ ADD_DEFINITIONS(
 
 SET(_link_LIBRARIES 
   ${KERNEL_OpUtil}        # class SALOME_Exception
-  ${KERNEL_SalomeContainer} 
   ${KERNEL_SalomeNS}
   ${KERNEL_SalomeLifeCycleCORBA}
+  ${KERNEL_SalomeIDLKernel}
   )
 
 # --- headers ---
@@ -45,12 +44,12 @@ SET(_HEADERS
 
 # --- sources ---
 SET(_SOURCES
-    PVServer_ServiceLoader.cxx
-  )
+ PVServer_ServiceLoader.cxx
+)
   
 SET(_SWIG
-    PVServer_ServiceLoader.i
-   )
+  PVServer_ServiceLoader.i
+)
   
 # --- rules ---
 ADD_LIBRARY(PVServerServiceLoader ${_SOURCES})
@@ -59,15 +58,21 @@ INSTALL(TARGETS PVServerServiceLoader EXPORT ${PROJECT_NAME}TargetGroup DESTINAT
 
 # --- SWIG part ---
 SET_SOURCE_FILES_PROPERTIES(${_SWIG} PROPERTIES CPLUSPLUS ON)
-SET_SOURCE_FILES_PROPERTIES(${_SWIG} PROPERTIES SWIG_DEFINITIONS "-shadow")
-SWIG_ADD_MODULE(PVServer_ServiceLoader python ${_SWIG})
+SET_SOURCE_FILES_PROPERTIES(${_SWIG} PROPERTIES SWIG_FLAGS "-py3")
+IF(${CMAKE_VERSION} VERSION_LESS "3.8.0") 
+  SWIG_ADD_MODULE(PVServer_ServiceLoader python ${_SWIG})
+ELSE()
+  SWIG_ADD_LIBRARY(PVServer_ServiceLoader LANGUAGE python SOURCES ${_SWIG})
+ENDIF()
+
+
 IF(WIN32)
   SET_TARGET_PROPERTIES(_PVServer_ServiceLoader PROPERTIES DEBUG_OUTPUT_NAME _PVServer_ServiceLoader_d)
 ENDIF(WIN32)
 SWIG_LINK_LIBRARIES(PVServer_ServiceLoader ${PYTHON_LIBRARIES} PVServerServiceLoader)
 
 INSTALL(TARGETS ${SWIG_MODULE_PVServer_ServiceLoader_REAL_NAME} EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_PYTHON})
-SALOME_INSTALL_SCRIPTS(${CMAKE_CURRENT_BINARY_DIR}/PVServer_ServiceLoader.py ${SALOME_INSTALL_PYTHON})
+SALOME_INSTALL_SCRIPTS(${CMAKE_CURRENT_BINARY_DIR}/PVServer_ServiceLoader.py ${SALOME_INSTALL_PYTHON} EXTRA_DPYS "${SWIG_MODULE_PVServer_ServiceLoader_REAL_NAME}")
   
 # --- header installation ---
 INSTALL(FILES ${_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS})