Bug 1310: Make sure there's a __init__.py in each build directory *and* each install directory.

CMake/FindPython.cmake

@@ -46,7 +46,7 @@ find_package(PythonLibs ${_options})
 if(NOT PYTHON_FOUND)
   if(PYTHON_EXECUTABLE)
     set(_cmd
-      "from distutils.sysconfig import *"
+      "from distutils.sysconfig import get_python_lib"
       "print get_python_lib(prefix='')")
     execute_process(
       COMMAND "${PYTHON_EXECUTABLE}" "-c" "${_cmd}"

CMake/PythonInstall.cmake

@@ -53,15 +53,6 @@ macro(python_install)
   set(_inst_dir "${PYTHON_INSTALL_DIR}/${_dest_dir}")
   set(_build_dir "${PYTHON_BUILD_DIR}/${_dest_dir}")
 
-  # Make sure that there's a __init__.py file in each directory
-  string(REGEX REPLACE "/" ";" _dir_list ${_dest_dir})
-  set(_init_dir "${PYTHON_BUILD_DIR}")
-  foreach(_dir ${_dir_list})
-    set(_init_dir "${_init_dir}/${_dir}")
-    execute_process(COMMAND 
-      ${CMAKE_COMMAND} -E touch "${_init_dir}/__init__.py")
-  endforeach(_dir ${_dir_list})
-
   # Install and byte-compile each Python file.
   foreach(_py ${_py_files})
     get_filename_component(_src_dir ${_py} ABSOLUTE)
@@ -76,4 +67,16 @@ macro(python_install)
       "execute_process(COMMAND ${PYTHON_EXECUTABLE} -c \"${_py_code}\")")
   endforeach(_py ${_py_files})
 
+  # Make sure that there's a __init__.py file in each build/install directory
+  string(REGEX REPLACE "/" ";" _dir_list ${_dest_dir})
+  set(_init_dir)
+  foreach(_dir ${_dir_list})
+    set(_init_dir "${_init_dir}/${_dir}")
+    execute_process(COMMAND ${CMAKE_COMMAND} -E touch
+      "${PYTHON_BUILD_DIR}${_init_dir}/__init__.py")
+    install(CODE 
+      "execute_process(COMMAND ${CMAKE_COMMAND} -E touch 
+        \"${PYTHON_INSTALL_DIR}${_init_dir}/__init__.py\")")
+  endforeach(_dir ${_dir_list})
+
 endmacro(python_install)