jyapayne/PySide
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed QtScriptTools CMake file and others files.

Browse source 
Reviewer: Luciano Wolf <luciano.wolf@openbossa.org>
          Hugo Parente Lima <hugo.pl@gmail.com>
This commit is contained in:
Renato Filho 2010-08-20 10:48:06 -03:00
commit 7b9ec90b4d
5 changed files with 27 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

13
PySide/QtNetwork/CMakeLists.txt
View file

@ -34,19 +34,6 @@ macro(CHECK_QT_NETWORK_MACRO macro_display_name qt_macro module_sources global_s
endmacro(CHECK_QT_NETWORK_MACRO) endmacro(CHECK_QT_NETWORK_MACRO)
if(Q_WS_X11)
set(MODULE_NAME network_x11)
set(SPECIFIC_OS_FILES
)
elseif(Q_WS_MAC)
set(MODULE_NAME network_mac)
set(SPECIFIC_OS_FILES
)
else()
message(FATAL_ERROR "OS not supported")
endif(Q_WS_X11)
if (${QT_VERSION_MAJOR} EQUAL 4 AND ${QT_VERSION_MINOR} GREATER 6) if (${QT_VERSION_MAJOR} EQUAL 4 AND ${QT_VERSION_MINOR} GREATER 6)
set (QtNetwork_47_SRC set (QtNetwork_47_SRC
${CMAKE_CURRENT_BINARY_DIR}/PySide/QtNetwork/qnetworkconfiguration_wrapper.cpp ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtNetwork/qnetworkconfiguration_wrapper.cpp

27
PySide/QtScriptTools/CMakeLists.txt
View file

@ -5,9 +5,9 @@ set(QtScriptTools_SRC
${CMAKE_CURRENT_BINARY_DIR}/PySide/QtScriptTools/qscriptenginedebugger_wrapper.cpp ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtScriptTools/qscriptenginedebugger_wrapper.cpp
) )
execute_generator(scripttools QtScriptTools_SRC "${CMAKE_CURRENT_BINARY_DIR}:${QtCore_SOURCE_DIR}:${QtGui_SOURCE_DIR}:${QtGui_BINARY_DIR}:${QtScript_SOURCE_DIR}:${QtScriptTools_SOURCE_DIR}") set(QtScriptTools_typesystem_path "${CMAKE_CURRENT_BINARY_DIR}:${QtCore_SOURCE_DIR}:${QtGui_SOURCE_DIR}:${QtGui_BINARY_DIR}:${QtScript_SOURCE_DIR}:${QtScriptTools_SOURCE_DIR}")
include_directories(${CMAKE_CURRENT_SOURCE_DIR} set(QtScriptTools_include_dirs ${CMAKE_CURRENT_SOURCE_DIR}
${QT_QTCORE_INCLUDE_DIR} ${QT_QTCORE_INCLUDE_DIR}
${QT_GUI_INCLUDE_DIR} ${QT_GUI_INCLUDE_DIR}
${QT_QTSCRIPT_INCLUDE_DIR} ${QT_QTSCRIPT_INCLUDE_DIR}
@ -20,23 +20,18 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}
${QtScript_BINARY_DIR}/PySide/QtScript/ ${QtScript_BINARY_DIR}/PySide/QtScript/
${CMAKE_CURRENT_BINARY_DIR}/PySide/QtScriptTools) ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtScriptTools)
add_library(QtScriptTools MODULE ${QtScriptTools_SRC}) set(QtScriptTools_libraries pyside
set_target_properties(QtScriptTools PROPERTIES PREFIX "")
target_link_libraries(QtScriptTools
pyside
${PYSIDE_PYTHON_LIBRARIES} ${PYSIDE_PYTHON_LIBRARIES}
${QT_QTCORE_LIBRARY} ${QT_QTCORE_LIBRARY}
${QT_GUI_LIBRARY} ${QT_GUI_LIBRARY}
${QT_QTSCRIPT_LIBRARY} ${QT_QTSCRIPT_LIBRARY}
${QT_QTSCRIPTTOOLS_LIBRARY}) ${QT_QTSCRIPTTOOLS_LIBRARY})
set(QtScriptTools_deps QtCore QtScript QtGui)
add_dependencies(QtScriptTools QtCore QtScript QtGui) create_pyside_module(QtScriptTools
${CMAKE_CURRENT_SOURCE_DIR}/typesystem_scripttools.xml
# install QtScriptTools_include_dirs
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtScriptTools${CMAKE_DEBUG_POSTFIX}.so QtScriptTools_libraries
DESTINATION ${SITE_PACKAGE}/PySide) QtScriptTools_deps
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtScriptTools/pyside_qtscripttools_python.h QtScriptTools_typesystem_path
DESTINATION include/PySide/QtScriptTools/) QtScriptTools_SRC)
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_scripttools.xml
DESTINATION share/PySide/typesystems)

12
PySide/QtSvg/CMakeLists.txt
View file

@ -1,17 +1,5 @@
project(QtSvg) project(QtSvg)
if(Q_WS_X11)
set(MODULE_NAME svg_x11)
set(SPECIFIC_OS_FILES
)
elseif(Q_WS_MAC)
set(MODULE_NAME svg_mac)
set(SPECIFIC_OS_FILES
)
else()
message(FATAL_ERROR "OS not supported")
endif(Q_WS_X11)
if (${QT_VERSION_MAJOR} EQUAL 4 AND ${QT_VERSION_MINOR} LESS 6) if (${QT_VERSION_MAJOR} EQUAL 4 AND ${QT_VERSION_MINOR} LESS 6)
set (QtSvg_46_SRC ) set (QtSvg_46_SRC )
else () else ()

12
PySide/QtTest/CMakeLists.txt
View file

@ -1,17 +1,5 @@
project(QtTest) project(QtTest)
if(Q_WS_X11)
set(MODULE_NAME test_x11)
set(SPECIFIC_OS_FILES
)
elseif(Q_WS_MAC)
set(MODULE_NAME test_mac)
set(SPECIFIC_OS_FILES
)
else()
message(FATAL_ERROR "OS not supported")
endif(Q_WS_X11)
set(QtTest_SRC set(QtTest_SRC
${CMAKE_CURRENT_BINARY_DIR}/PySide/QtTest/qtest_wrapper.cpp ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtTest/qtest_wrapper.cpp
${CMAKE_CURRENT_BINARY_DIR}/PySide/QtTest/qttest_module_wrapper.cpp ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtTest/qttest_module_wrapper.cpp

12
PySide/QtWebKit/CMakeLists.txt
View file

@ -1,17 +1,5 @@
project(QtWebKit) project(QtWebKit)
if(Q_WS_X11)
set(MODULE_NAME webkit_x11)
set(SPECIFIC_OS_FILES
)
elseif(Q_WS_MAC)
set(MODULE_NAME webkit_mac)
set(SPECIFIC_OS_FILES
)
else()
message(FATAL_ERROR "OS not supported")
endif(Q_WS_X11)
if (${QT_VERSION_MAJOR} EQUAL 4 AND ${QT_VERSION_MINOR} LESS 6) if (${QT_VERSION_MAJOR} EQUAL 4 AND ${QT_VERSION_MINOR} LESS 6)
set (QtWebKit_46_SRC ) set (QtWebKit_46_SRC )
else () else ()