Merge branch 'V7_dev'

[modules/kernel.git] / bin / CMakeLists.txt

diff --git a/bin/CMakeLists.txt b/bin/CMakeLists.txt
index b2847db74e8470a76c9feadad9a82fab0e6b0724..587e841fda1a987fc310657d622d7ff22366d8fd 100755 (executable)
--- a/bin/CMakeLists.txt
+++ b/bin/CMakeLists.txt
@@ -1,9 +1,9 @@
-# Copyright (C) 2012-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2012-2016  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
 # License as published by the Free Software Foundation; either
-# version 2.1 of the License.
+# version 2.1 of the License, or (at your option) any later version.
 #
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -20,6 +20,7 @@
 ADD_SUBDIRECTORY(appliskel)
 
 SALOME_CONFIGURE_FILE(VERSION.in VERSION INSTALL ${SALOME_INSTALL_BINS})
+SALOME_CONFIGURE_FILE(salomeContextUtils.py.in salomeContextUtils.py)
 
 # ===============================================================
 # Files to be installed
@@ -43,13 +44,14 @@ SET(SCRIPTS
   orbmodule.py
   ORBConfigFile.py
   parseConfigFile.py
-  runSalome
+  PortManager.py
   runSalome.py
   runSession.py
   runConsole.py
+  runTests.py
   salomeConsole.py
-  salomeLauncherUtils.py
-  salomeRunner.py
+  ${CMAKE_CURRENT_BINARY_DIR}/salomeContextUtils.py
+  salomeContext.py
   salome_session.py
   salome_utils.py
   searchFreePort.py
@@ -62,12 +64,4 @@ SET(SCRIPTS
   waitNS.py
   )
 
-IF(SALOME_USE_PORTMANAGER)
-  SET(PORTMANAGER_SCRIPTS
-    PortManager.py
-    Singleton.py
-    )
-  LIST(APPEND SCRIPTS ${PORTMANAGER_SCRIPTS})
-ENDIF()
-
 SALOME_INSTALL_SCRIPTS("${SCRIPTS}" ${SALOME_INSTALL_SCRIPT_SCRIPTS})