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
Synchronize adm files
[modules/kernel.git]
/
src
/
KERNEL_PY
/
kernel
/
CMakeLists.txt
diff --git
a/src/KERNEL_PY/kernel/CMakeLists.txt
b/src/KERNEL_PY/kernel/CMakeLists.txt
index bad4e662c856f3be6df4d3acebe23e3b38d27c8e..18ad703f630397faa1d7f549badf86e7f93128fe 100755
(executable)
--- a/
src/KERNEL_PY/kernel/CMakeLists.txt
+++ b/
src/KERNEL_PY/kernel/CMakeLists.txt
@@
-1,9
+1,9
@@
-# Copyright (C) 2012-201
3
CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2012-201
4
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
#
# 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
#
# This library is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-19,8
+19,8
@@
ADD_SUBDIRECTORY(parametric)
ADD_SUBDIRECTORY(parametric)
-
CONFIGURE_FILE(logconfig.py.in logconfig.py @ONLY
)
-
CONFIGURE_FILE(kernelpy_autotest.sh.in kernelpy_autotest.sh @ONLY
)
+
SALOME_CONFIGURE_FILE(logconfig.py.in logconfig.py
)
+
SALOME_CONFIGURE_FILE(kernelpy_autotest.sh.in kernelpy_autotest.sh
)
# This first set of modules could be used in any context, you just
# have to get a python environement.
# This first set of modules could be used in any context, you just
# have to get a python environement.
@@
-40,10
+40,9
@@
SET(mypkgpython_PYTHON
syshelper.py
)
# This set of modules required a running SALOME application.
syshelper.py
)
# This set of modules required a running SALOME application.
-SET(mypkgpython_PYTHON
- ${mypkgpython_PYTHON}
+LIST(APPEND mypkgpython_PYTHON
studyedit.py
services.py
studyedit.py
services.py
+ ${CMAKE_CURRENT_BINARY_DIR}/logconfig.py
)
)
-SALOME_INSTALL_SCRIPTS("${mypkgpython_PYTHON}" ${KERNEL_salomepythondir}/salome/kernel)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/logconfig.py DESTINATION ${KERNEL_salomepythondir}/salome/kernel)
\ No newline at end of file
+SALOME_INSTALL_SCRIPTS("${mypkgpython_PYTHON}" ${SALOME_INSTALL_PYTHON}/salome/kernel)