Salome HOME
projects
/
tools
/
medcoupling.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Minor fix.
[tools/medcoupling.git]
/
cmake_files
/
SalomeMacros.cmake
diff --git
a/cmake_files/SalomeMacros.cmake
b/cmake_files/SalomeMacros.cmake
index 34f85786d2d062f94631dfcefe31e824c1774635..f78ffe4ac1c29134793b733015d5b61dc6f4b781 100644
(file)
--- a/
cmake_files/SalomeMacros.cmake
+++ b/
cmake_files/SalomeMacros.cmake
@@
-1,4
+1,4
@@
-# Copyright (C) 2012-201
5
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
@@
-136,13
+136,13
@@
MACRO(SALOME_INSTALL_SCRIPTS file_list path)
LIST(APPEND _all_pyo ${_pyo_file})
ADD_CUSTOM_COMMAND(
OUTPUT ${_pyc_file}
LIST(APPEND _all_pyo ${_pyo_file})
ADD_CUSTOM_COMMAND(
OUTPUT ${_pyc_file}
- COMMAND ${PYTHON_EXECUTABLE} -c "import py_compile ; py_compile.compile('${_source_prefix}${file}', '${_pyc_file}' )"
+ COMMAND ${PYTHON_EXECUTABLE} -c "import py_compile ; py_compile.compile('${_source_prefix}${file}', '${_pyc_file}'
, doraise=True
)"
DEPENDS ${PREFIX}${file}
VERBATIM
)
ADD_CUSTOM_COMMAND(
OUTPUT ${_pyo_file}
DEPENDS ${PREFIX}${file}
VERBATIM
)
ADD_CUSTOM_COMMAND(
OUTPUT ${_pyo_file}
- COMMAND ${PYTHON_EXECUTABLE} -O -c "import py_compile ; py_compile.compile('${_source_prefix}${file}', '${_pyo_file}' )"
+ COMMAND ${PYTHON_EXECUTABLE} -O -c "import py_compile ; py_compile.compile('${_source_prefix}${file}', '${_pyo_file}'
, doraise=True
)"
DEPENDS ${PREFIX}${file}
VERBATIM
)
DEPENDS ${PREFIX}${file}
VERBATIM
)
@@
-944,7
+944,8
@@
MACRO(SALOME_CONFIGURE_PREPARE)
FOREACH(_prereq IN LISTS _tmp_prereq)
IF(${_prereq}_DIR)
SET(_PREREQ_LIST "${_PREREQ_LIST} ${_prereq}")
FOREACH(_prereq IN LISTS _tmp_prereq)
IF(${_prereq}_DIR)
SET(_PREREQ_LIST "${_PREREQ_LIST} ${_prereq}")
- SET(_PREREQ_DIR_LIST "${_PREREQ_DIR_LIST} \"${${_prereq}_DIR}\"")
+ FILE(TO_CMAKE_PATH ${${_prereq}_DIR} CURR_DIR)
+ SET(_PREREQ_DIR_LIST "${_PREREQ_DIR_LIST} \"${CURR_DIR}\"")
SALOME_APPEND_LIST_OF_LIST(_PREREQ_COMPO_LIST Salome${_prereq}_COMPONENTS)
ENDIF()
ENDFOREACH()
SALOME_APPEND_LIST_OF_LIST(_PREREQ_COMPO_LIST Salome${_prereq}_COMPONENTS)
ENDIF()
ENDFOREACH()