Fix minor typo.

.gitignore

@@ -7,4 +7,3 @@ build
 .preprocessed.tmp
 .*.swp
 *.kdev4
-doc/_build

CMakeLists.txt

@@ -1,27 +1,45 @@
-include(icecc.cmake)
+Include(icecc.cmake)
 project(shiboken)
 
 cmake_minimum_required(VERSION 2.6)
 
 set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/Modules/
                       ${CMAKE_MODULE_PATH})
 
-find_package(Qt4 4.5.0 REQUIRED)
-find_package(ApiExtractor 0.8 REQUIRED)
-find_package(GeneratorRunner 0.6.1 REQUIRED)
-find_package(PythonLibs REQUIRED)
-find_package(PythonInterpWithDebug REQUIRED)
+find_package(Qt4 4.5.0)
+find_package(ApiExtractor 0.10.9 REQUIRED)
+find_package(GeneratorRunner 0.6.15 REQUIRED)
 
 add_definitions(${QT_DEFINITIONS})
 
-option(AVOID_PROTECTED_HACK "Avoid protected hack on generated bindings." FALSE)
+set(shiboken_MAJOR_VERSION "1")
+set(shiboken_MINOR_VERSION "0")
+set(shiboken_MICRO_VERSION "10")
+set(shiboken_VERSION "${shiboken_MAJOR_VERSION}.${shiboken_MINOR_VERSION}.${shiboken_MICRO_VERSION}")
+
 option(BUILD_TESTS "Build tests." TRUE)
-option(ENABLE_VERSION_SUFFIX "Used to use current version in suffix to generated files. This is used to allow multiples versions installed simultaneous." FALSE)
+option(USE_PYTHON3 "Use python3 libraries to build shiboken." FALSE)
+
+if (USE_PYTHON3)
+    find_package(Python3Libs)
+    find_package(Python3InterpWithDebug)
+    #use commom vars
+    set(PYTHONLIBS_FOUND ${PYTHON3LIBS_FOUND})
+    set(PYTHON_LIBRARIES ${PYTHON3_LIBRARIES})
+    set(PYTHON_INCLUDE_DIRS ${PYTHON3_INCLUDE_DIRS})
+    set(PYTHON_DEBUG_LIBRARIES ${PYTHON3_DEBUG_LIBRARIES})
+    set(PYTHONINTERP_FOUND ${PYTHON3INTERP_FOUND})
+    set(PYTHON_EXECUTABLE ${PYTHON3_EXECUTABLE})
+else()
+    find_package(PythonLibs 2.6)
+    find_package(PythonInterpWithDebug)
+endif()
+
 
 if(MSVC)
     set(CMAKE_CXX_FLAGS "/Zc:wchar_t- /GR /EHsc /DWIN32 /D_WINDOWS /D_SCL_SECURE_NO_WARNINGS")
 else()
-    if(CMAKE_HOST_UNIX)
+    if(CMAKE_HOST_UNIX AND NOT CYGWIN)
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -fvisibility=hidden -Wno-strict-aliasing")
     endif()
     set(CMAKE_CXX_FLAGS_DEBUG "-g")
@@ -35,98 +53,69 @@ else()
     endif()
 endif()
 
-if (WIN32)
-    set(PATH_SEP "\;")
-else()
-    set(PATH_SEP ":")
-endif()
-
-if(WIN32 OR AVOID_PROTECTED_HACK)
-    message(STATUS "Avoiding protected hack!")
-    add_definitions("-DAVOID_PROTECTED_HACK")
-else()
-    message(STATUS "Using protected hack!")
-endif()
-
 set(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)" )
 set(LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" CACHE PATH "The subdirectory relative to the install prefix where libraries will be installed (default is /lib${LIB_SUFFIX})" FORCE)
 
-set(shiboken_MAJOR_VERSION "0")
-set(shiboken_MINOR_VERSION "5")
-set(shiboken_MICRO_VERSION "0")
-set(shiboken_VERSION "${shiboken_MAJOR_VERSION}.${shiboken_MINOR_VERSION}.${shiboken_MICRO_VERSION}")
-if(ENABLE_VERSION_SUFFIX)
-    set(shiboken_SUFFIX "-${shiboken_MAJOR_VERSION}.${shiboken_MINOR_VERSION}")
+if (WIN32)
+    set(PATH_SEP "\;")
 else()
-    set(shiboken_SUFFIX "")
+    set(PATH_SEP ":")
 endif()
 
-set(shiboken_SRC
-cppgenerator.cpp
-headergenerator.cpp
-overloaddata.cpp
-shiboken.cpp
-shibokengenerator.cpp
-)
-
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}
-                    ${APIEXTRACTOR_INCLUDE_DIR}
-                    ${GENERATORRUNNER_INCLUDE_DIR}
-                    ${QT_INCLUDE_DIR}
-                    ${QT_QTCORE_INCLUDE_DIR})
-
-add_library(shiboken_generator SHARED ${shiboken_SRC})
-set_property(TARGET shiboken_generator PROPERTY PREFIX "")
-
-target_link_libraries(shiboken_generator
-                      ${APIEXTRACTOR_LIBRARY}
-                      ${GENERATORRUNNER_LIBRARY}
-                      ${QT_QTCORE_LIBRARY})
-
-add_executable(shiboken main.cpp)
-set_target_properties(shiboken PROPERTIES OUTPUT_NAME shiboken${shiboken_SUFFIX})
-target_link_libraries(shiboken ${QT_QTCORE_LIBRARY})
-
 # uninstall target
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake"
                "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
                IMMEDIATE @ONLY)
 add_custom_target(uninstall "${CMAKE_COMMAND}"
                   -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
 
-# Detect if the python libs were compiled in debug mode
-execute_process(
-    COMMAND ${PYTHON_EXECUTABLE} -c "from distutils import sysconfig; \\
-        print sysconfig.get_config_var('Py_DEBUG')"
-    OUTPUT_VARIABLE PY_DEBUG
-    OUTPUT_STRIP_TRAILING_WHITESPACE)
-
+set(SHIBOKEN_BUILD_TYPE "Release")
 if(CMAKE_BUILD_TYPE STREQUAL "Debug")
     if(NOT PYTHON_DEBUG_LIBRARIES)
         message(FATAL_ERROR "Python debug library not found. Try compile shiboken with -DCMAKE_BUILD_TYPE=Release")
     endif()
-    if(NOT PY_DEBUG)
+    if(NOT PYTHON_WITH_DEBUG)
         message(WARNING "Compiling shiboken with debug enabled, but the python executable was not compiled with debug support.")
     else()
         add_definitions("-DPy_DEBUG")
+        set(SBK_ADD_PY_DEBUG_DEFINITION "add_definitions(\"-DPy_DEBUG\")")
+        set(SBK_PKG_CONFIG_PY_DEBUG_DEFINITION " -DPy_DEBUG")
     endif()
     set(SBK_PYTHON_LIBRARIES ${PYTHON_DEBUG_LIBRARIES})
+    set(SHIBOKEN_BUILD_TYPE "Debug")
 else()
     set(SBK_PYTHON_LIBRARIES ${PYTHON_LIBRARIES})
     add_definitions("-DNDEBUG")
 endif()
+if(APPLE)
+    set(SBK_PYTHON_LIBRARIES "-undefined dynamic_lookup")
+endif()
 
-if (BUILD_TESTS)
-    enable_testing()
+if(CMAKE_VERSION VERSION_LESS 2.8)
+    set(SBK_PYTHON_INCLUDE_DIR ${PYTHON_INCLUDE_PATH})
+else()
+    set(SBK_PYTHON_INCLUDE_DIR ${PYTHON_INCLUDE_DIRS})
 endif()
 
 add_subdirectory(libshiboken)
+add_subdirectory(doc)
 
-if (BUILD_TESTS)
-    add_subdirectory(tests)
+# deps found, compile the generator.
+if (QT4_FOUND AND ApiExtractor_FOUND AND GeneratorRunner_FOUND AND PYTHONLIBS_FOUND AND PYTHONINTERP_FOUND)
+    add_subdirectory(generator)
+    add_subdirectory(shibokenmodule)
+
+    if (BUILD_TESTS)
+        enable_testing()
+        add_subdirectory(tests)
+    endif()
+else()
+    message(WARNING "Some dependencies were not found, shiboken generator compilation disabled!")
 endif()
+
 add_subdirectory(data)
 
+# dist target
 set(ARCHIVE_NAME ${CMAKE_PROJECT_NAME}-${shiboken_VERSION})
 add_custom_target(dist
     COMMAND mkdir -p "${CMAKE_BINARY_DIR}/${ARCHIVE_NAME}" &&
@@ -137,8 +126,4 @@ add_custom_target(dist
             echo "Source package created at ${CMAKE_BINARY_DIR}/${ARCHIVE_NAME}.tar.bz2.\n"
     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
 
-add_dependencies(shiboken shiboken_generator)
-
-install(TARGETS shiboken_generator DESTINATION "${GENERATORRUNNER_PLUGIN_DIR}")
-install(TARGETS shiboken DESTINATION bin)