]> SALOME platform Git repositories - tools/configuration.git/commitdiff
Salome HOME
Remove pyo and pyc gen due to wrong dep bug on pyc and pyo generation on cmake 3.12
authorAnthony Geay <anthony.geay@edf.fr>
Thu, 30 Aug 2018 15:41:31 +0000 (17:41 +0200)
committerAnthony Geay <anthony.geay@edf.fr>
Thu, 30 Aug 2018 15:41:31 +0000 (17:41 +0200)
cmake/SalomeMacros.cmake

index d91eb4c932b1ed9c8a3dc1f620ee6da71fd98d4c..8a85fe828495c0360130527971044f9392533249 100644 (file)
@@ -129,24 +129,24 @@ MACRO(SALOME_INSTALL_SCRIPTS file_list path)
     GET_FILENAME_COMPONENT(ext ${file} EXT)
     GET_FILENAME_COMPONENT(we_ext ${file} NAME_WE)
 
-    IF(ext STREQUAL .py)    
-      # Generate and install the pyc and pyo
-      # [ABN] Important: we avoid references or usage of CMAKE_INSTALL_PREFIX which is not correctly set 
-      # when using CPack.       
-      SET(_pyc_file "${CMAKE_CURRENT_BINARY_DIR}/${we_ext}.cpython-${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}.pyc")
-      SET(_pyo_file "${CMAKE_CURRENT_BINARY_DIR}/${we_ext}.cpython-${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}.opt-1.pyc")
-      LIST(APPEND _all_pyc ${_pyc_file})
-      LIST(APPEND _all_pyo ${_pyo_file})
-      ADD_CUSTOM_COMMAND(
-        OUTPUT ${_pyc_file} ${_pyo_file}
-        COMMAND ${PYTHON_EXECUTABLE} -c "from py_compile import compile; compile('${_source_prefix}${file}', '${_pyc_file}', doraise=True, optimize=0); compile('${_source_prefix}${file}', '${_pyo_file}', doraise=True, optimize=1)"
-        DEPENDS ${PREFIX}${file}
-        VERBATIM
-      )
-      # Install the .pyo and the .pyc
-      INSTALL(FILES ${_pyc_file} DESTINATION ${path}/__pycache__ PERMISSIONS ${PERMS})
-      INSTALL(FILES ${_pyo_file} DESTINATION ${path}/__pycache__ PERMISSIONS ${PERMS})
-    ENDIF(ext STREQUAL .py)
+    IF(ext STREQUAL .py)    
+      # Generate and install the pyc and pyo
+      # [ABN] Important: we avoid references or usage of CMAKE_INSTALL_PREFIX which is not correctly set 
+      # when using CPack.       
+      SET(_pyc_file "${CMAKE_CURRENT_BINARY_DIR}/${we_ext}.cpython-${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}.pyc")
+      SET(_pyo_file "${CMAKE_CURRENT_BINARY_DIR}/${we_ext}.cpython-${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}.opt-1.pyc")
+      LIST(APPEND _all_pyc ${_pyc_file})
+      LIST(APPEND _all_pyo ${_pyo_file})
+      ADD_CUSTOM_COMMAND(
+        OUTPUT ${_pyc_file} ${_pyo_file}
+        COMMAND ${PYTHON_EXECUTABLE} -c "from py_compile import compile; compile('${_source_prefix}${file}', '${_pyc_file}', doraise=True, optimize=0); compile('${_source_prefix}${file}', '${_pyo_file}', doraise=True, optimize=1)"
+    #     DEPENDS "${PREFIX}${file}"
+        VERBATIM
+      )
+      # Install the .pyo and the .pyc
+      INSTALL(FILES ${_pyc_file} DESTINATION ${path}/__pycache__ PERMISSIONS ${PERMS})
+      INSTALL(FILES ${_pyo_file} DESTINATION ${path}/__pycache__ PERMISSIONS ${PERMS})
+    ENDIF(ext STREQUAL .py)
 
   # get relative path (from CMAKE_SOURCE_DIR to CMAKE_CURRENT_SOURCE_DIR)
   STRING(REGEX REPLACE ${CMAKE_SOURCE_DIR} "" rel_dir ${CMAKE_CURRENT_SOURCE_DIR})