Build on 32-bit hosts properly

CMakeLists.txt

@@ -56,7 +56,9 @@ include_directories(${CMAKE_SOURCE_DIR}/Include)
 include_directories(${CMAKE_SOURCE_DIR}/Python)
 
 if(UNIX)
-    include_directories(${CMAKE_SOURCE_DIR}/cmake/config-unix)
+    configure_file(${CMAKE_SOURCE_DIR}/cmake/config-unix/pyconfig.h.in
+                   ${CMAKE_BINARY_DIR}/cmake/config-unix/pyconfig.h)
+    include_directories(${CMAKE_BINARY_DIR}/cmake/config-unix)
 elseif(WIN32)
     include_directories(${CMAKE_SOURCE_DIR}/PC)
 endif(UNIX)
@@ -104,7 +106,7 @@ install(FILES ${CMAKE_BINARY_DIR}/makefile-variables
         DESTINATION ${PYTHONHOME}/config/
         RENAME Makefile)
 if(UNIX)
-    install(FILES cmake/config-unix/pyconfig.h
+    install(FILES ${CMAKE_BINARY_DIR}/cmake/config-unix/pyconfig.h
             DESTINATION include/${LIBPYTHON}/)
 elseif(WIN32)
     install(FILES PC/pyconfig.h

cmake/config-unix/pyconfig.h → cmake/config-unix/pyconfig.h.in

@@ -986,7 +986,7 @@
 #define SIZEOF_INT 4
 
 /* The size of `long', as computed by sizeof. */
-#define SIZEOF_LONG 8
+#define SIZEOF_LONG ${CMAKE_SIZEOF_VOID_P}
 
 /* The size of `long double', as computed by sizeof. */
 #define SIZEOF_LONG_DOUBLE 16
@@ -1013,10 +1013,10 @@
 #define SIZEOF_TIME_T 8
 
 /* The size of `uintptr_t', as computed by sizeof. */
-#define SIZEOF_UINTPTR_T 8
+#define SIZEOF_UINTPTR_T ${CMAKE_SIZEOF_VOID_P}
 
 /* The size of `void *', as computed by sizeof. */
-#define SIZEOF_VOID_P 8
+#define SIZEOF_VOID_P ${CMAKE_SIZEOF_VOID_P}
 
 /* The size of `wchar_t', as computed by sizeof. */
 #define SIZEOF_WCHAR_T 4