Salome HOME
projects
/
modules
/
kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'V7_dev'
[modules/kernel.git]
/
bin
/
CMakeLists.txt
diff --git
a/bin/CMakeLists.txt
b/bin/CMakeLists.txt
index 431f7f961596143adf153cbf20f1b24ef7835b91..587e841fda1a987fc310657d622d7ff22366d8fd 100755
(executable)
--- a/
bin/CMakeLists.txt
+++ b/
bin/CMakeLists.txt
@@
-1,4
+1,4
@@
-# Copyright (C) 2012-201
4
CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2012-201
6
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
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
@@
-20,7
+20,7
@@
ADD_SUBDIRECTORY(appliskel)
SALOME_CONFIGURE_FILE(VERSION.in VERSION INSTALL ${SALOME_INSTALL_BINS})
ADD_SUBDIRECTORY(appliskel)
SALOME_CONFIGURE_FILE(VERSION.in VERSION INSTALL ${SALOME_INSTALL_BINS})
-SALOME_CONFIGURE_FILE(salome
LauncherUtils.py.in salomeLauncher
Utils.py)
+SALOME_CONFIGURE_FILE(salome
ContextUtils.py.in salomeContext
Utils.py)
# ===============================================================
# Files to be installed
# ===============================================================
# Files to be installed
@@
-44,13
+44,14
@@
SET(SCRIPTS
orbmodule.py
ORBConfigFile.py
parseConfigFile.py
orbmodule.py
ORBConfigFile.py
parseConfigFile.py
- runSalome
+ PortManager.py
runSalome.py
runSession.py
runConsole.py
runSalome.py
runSession.py
runConsole.py
+ runTests.py
salomeConsole.py
salomeConsole.py
- ${CMAKE_CURRENT_BINARY_DIR}/salome
Launcher
Utils.py
- salome
Runner
.py
+ ${CMAKE_CURRENT_BINARY_DIR}/salome
Context
Utils.py
+ salome
Context
.py
salome_session.py
salome_utils.py
searchFreePort.py
salome_session.py
salome_utils.py
searchFreePort.py
@@
-63,11
+64,4
@@
SET(SCRIPTS
waitNS.py
)
waitNS.py
)
-IF(SALOME_USE_PORTMANAGER)
- SET(PORTMANAGER_SCRIPTS
- PortManager.py
- )
- LIST(APPEND SCRIPTS ${PORTMANAGER_SCRIPTS})
-ENDIF()
-
SALOME_INSTALL_SCRIPTS("${SCRIPTS}" ${SALOME_INSTALL_SCRIPT_SCRIPTS})
SALOME_INSTALL_SCRIPTS("${SCRIPTS}" ${SALOME_INSTALL_SCRIPT_SCRIPTS})