X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FUtils%2FCMakeLists.txt;h=26f9560bb82de6519b82a0375589baa38b3b034f;hb=9c6ed3579d4bd6b75aec9405620638b9629a2a45;hp=ec38d52d2005b15263099187dcb2a4317f14e6bc;hpb=a7e425483b5eb6a0491cbad5ef63cc67ccf64f7c;p=modules%2Fkernel.git

diff --git a/src/Utils/CMakeLists.txt b/src/Utils/CMakeLists.txt
old mode 100755
new mode 100644
index ec38d52d2..26f9560bb
--- a/src/Utils/CMakeLists.txt
+++ b/src/Utils/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2012-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
@@ -20,16 +20,18 @@
 IF(NOT SALOME_LIGHT_ONLY)
 
   INCLUDE_DIRECTORIES(
-    ${OMNIORB_INCLUDE_DIR}
-    ${PTHREAD_INCLUDE_DIR}
-    ${PROJECT_BINARY_DIR}/salome_adm
     ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}/../ArgvKeeper
     ${CMAKE_CURRENT_SOURCE_DIR}/../Basics
     ${CMAKE_CURRENT_SOURCE_DIR}/../SALOMELocalTrace
     ${PROJECT_BINARY_DIR}/idl
+    ${OMNIORB_INCLUDE_DIR}
+    ${PTHREAD_INCLUDE_DIR}
+    ${PROJECT_BINARY_DIR}/salome_adm
   )
   ADD_DEFINITIONS(${OMNIORB_DEFINITIONS} ${PTHREAD_DEFINITIONS})
   SET(COMMON_LIBS
+    ArgvKeeper
     SALOMELocalTrace 
     SalomeIDLKernel 
     ${OMNIORB_LIBRARIES} 
@@ -45,27 +47,31 @@ IF(NOT SALOME_LIGHT_ONLY)
     Utils_DESTRUCTEUR_GENERIQUE.cxx
     Utils_ExceptHandlers.cxx
     Utils_Mutex.cxx
+    OpUtil.cxx
   )
   FILE(GLOB COMMON_HEADERS_HXX "${CMAKE_CURRENT_SOURCE_DIR}/*.hxx" )
   
 ELSE()
 
   INCLUDE_DIRECTORIES(
-    ${PTHREAD_INCLUDE_DIR}
-    ${PROJECT_BINARY_DIR}/salome_adm
     ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}/../ArgvKeeper
     ${CMAKE_CURRENT_SOURCE_DIR}/../Basics
     ${CMAKE_CURRENT_SOURCE_DIR}/../SALOMELocalTrace
+    ${PTHREAD_INCLUDE_DIR}
+    ${PROJECT_BINARY_DIR}/salome_adm
   )
   SET(COMMON_LIBS
+    ArgvKeeper
     SALOMELocalTrace
     ${PTHREAD_LIBRARIES}
   )
   SET(OpUtil_SOURCES
     Utils_SALOME_Exception.cxx
     duplicate.cxx
+    OpUtil.cxx
   )  
-  SET(COMMON_HEADERS_HXX Utils_SALOME_Exception.hxx) 
+  SET(COMMON_HEADERS_HXX Utils_SALOME_Exception.hxx OpUtil.hxx)
   
 ENDIF()
 
@@ -79,4 +85,3 @@ ADD_LIBRARY(OpUtil ${OpUtil_SOURCES})
 TARGET_LINK_LIBRARIES(OpUtil ${COMMON_LIBS})
 INSTALL(TARGETS OpUtil EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
 INSTALL(FILES ${COMMON_HEADERS_HXX} DESTINATION ${SALOME_INSTALL_HEADERS})
-INSTALL(FILES capsulethunk.h DESTINATION ${SALOME_INSTALL_HEADERS})