[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdebindings/smoke
From: Arno Rehn <kde () arnorehn ! de>
Date: 2009-09-13 17:27:54
Message-ID: 1252862874.651184.8405.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 1022996 by arnorehn:
khtml smoke -> smokegenerator
M +1 -1 kde/config.xml.cmake
M +31 -68 khtml/CMakeLists.txt
A khtml/khtml_includes.h [License: UNKNOWN]
A khtml/smokeconfig.xml
--- trunk/KDE/kdebindings/smoke/kde/config.xml.cmake #1022995:1022996
@@ -2,7 +2,7 @@
<resolveTypedefs>true</resolveTypedefs>
<qtMode>true</qtMode>
<generator>smoke</generator>
- <definesList>@CMAKE_BINARY_DIR@/examples/qtdefines</definesList>
+ <definesList>@CMAKE_BINARY_DIR@/smoke/qtdefines</definesList>
<includeDirs>
<dir>@QT_INCLUDE_DIR@</dir>
<dir>@QT_QTCORE_INCLUDE_DIR@</dir>
--- trunk/KDE/kdebindings/smoke/khtml/CMakeLists.txt #1022995:1022996
@@ -1,61 +1,40 @@
include_directories( ${CMAKE_SOURCE_DIR}/smoke )
-set(srcdir ${CMAKE_CURRENT_SOURCE_DIR})
-set(KDE_PREFIX ${CMAKE_INSTALL_PREFIX})
-set(qt_includes ${QT_INCLUDE_DIR})
-set(kde_includes ${KDE4_INCLUDE_DIR})
-if(OPENGL_FOUND AND OPENGL_GLU_FOUND)
- set(KDE_HAVE_GL "yes")
-else(OPENGL_FOUND AND OPENGL_GLU_FOUND)
- set(KDE_HAVE_GL "no")
-endif(OPENGL_FOUND AND OPENGL_GLU_FOUND)
-
-# for qtguess.pl
-if (APPLE)
-set(qtflags "-framework QtCore -framework QtGui")
-else (APPLE)
-set(qtflags "-lQtCore -lQtGui")
-endif (APPLE)
-FOREACH(filename ${QT_INCLUDES})
- set(all_includes "-I${filename} ${all_includes}")
-ENDFOREACH(filename)
-
-
########### next target ###############
add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_1.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_2.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_3.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_4.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_5.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_6.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_7.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_8.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_9.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_10.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_11.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_12.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_13.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_14.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_15.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_16.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_17.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_18.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_19.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_20.cpp
+ ${CMAKE_CURRENT_BINARY_DIR}/x_1.cpp
+ ${CMAKE_CURRENT_BINARY_DIR}/x_2.cpp
+ ${CMAKE_CURRENT_BINARY_DIR}/x_3.cpp
+ ${CMAKE_CURRENT_BINARY_DIR}/x_4.cpp
+ ${CMAKE_CURRENT_BINARY_DIR}/x_5.cpp
+ ${CMAKE_CURRENT_BINARY_DIR}/x_6.cpp
+ ${CMAKE_CURRENT_BINARY_DIR}/x_7.cpp
+ ${CMAKE_CURRENT_BINARY_DIR}/x_8.cpp
+ ${CMAKE_CURRENT_BINARY_DIR}/x_9.cpp
+ ${CMAKE_CURRENT_BINARY_DIR}/x_10.cpp
+ ${CMAKE_CURRENT_BINARY_DIR}/x_11.cpp
+ ${CMAKE_CURRENT_BINARY_DIR}/x_12.cpp
+ ${CMAKE_CURRENT_BINARY_DIR}/x_13.cpp
+ ${CMAKE_CURRENT_BINARY_DIR}/x_14.cpp
+ ${CMAKE_CURRENT_BINARY_DIR}/x_15.cpp
+ ${CMAKE_CURRENT_BINARY_DIR}/x_16.cpp
+ ${CMAKE_CURRENT_BINARY_DIR}/x_17.cpp
+ ${CMAKE_CURRENT_BINARY_DIR}/x_18.cpp
+ ${CMAKE_CURRENT_BINARY_DIR}/x_19.cpp
+ ${CMAKE_CURRENT_BINARY_DIR}/x_20.cpp
- COMMAND ${PERL_EXECUTABLE} ARGS \
${CMAKE_CURRENT_BINARY_DIR}/generate.pl
- DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/generate.pl
- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+ COMMAND generator
+ ARGS -config "${CMAKE_CURRENT_BINARY_DIR}/../kde/config.xml" -smokeconfig \
"${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml" + -- \
${CMAKE_CURRENT_SOURCE_DIR}/khtml_includes.h + WORKING_DIRECTORY \
${CMAKE_CURRENT_BINARY_DIR})
macro_add_file_dependencies( ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp \
${CMAKE_CURRENT_BINARY_DIR}/x_1.cpp )
-
set(smokekhtml_LIB_SRCS ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_1.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/x_2.cpp
+ ${CMAKE_CURRENT_BINARY_DIR}/x_1.cpp
+ ${CMAKE_CURRENT_BINARY_DIR}/x_2.cpp
${CMAKE_CURRENT_BINARY_DIR}/x_3.cpp
${CMAKE_CURRENT_BINARY_DIR}/x_4.cpp
${CMAKE_CURRENT_BINARY_DIR}/x_5.cpp
@@ -76,32 +55,16 @@
${CMAKE_CURRENT_BINARY_DIR}/x_20.cpp
)
-# Needed to make QSqlRelationalDelegate compile
-ADD_DEFINITIONS (-DQT_GUI_LIB)
IF(CMAKE_CXX_FLAGS MATCHES "-fvisibility")
ADD_DEFINITIONS(-DGCC_VISIBILITY)
ENDIF(CMAKE_CXX_FLAGS MATCHES "-fvisibility")
-INCLUDE(${QT_USE_FILE})
-# At this point, QT_LIBRARIES will contain a list of the found Qt Libs
-# and QT_INCLUDES contains the directories of the found includes
+include_directories( ${QT_INCLUDES} ${KDE4_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR}/.. \
${CMAKE_CURRENT_SOURCE_DIR} )
-FOREACH(filename ${QT_INCLUDES})
- set(all_includes "-I${filename} ${all_includes}")
-ENDFOREACH(filename)
-
-FOREACH(incname ${QT_INCLUDES})
- SET(qt_incs "'${incname}', ${qt_incs}")
-ENDFOREACH(incname)
-
-FOREACH(libname ${QT_LIBRARIES})
- set(all_libs "${libname} ${all_libs}")
-ENDFOREACH(libname)
-
-configure_file(generate.pl.cmake ${CMAKE_CURRENT_BINARY_DIR}/generate.pl @ONLY )
-
kde4_add_library(smokekhtml SHARED ${smokekhtml_LIB_SRCS})
+add_dependencies(smokekhtml smokekde smokeqt)
+
target_link_libraries(smokekhtml
${QT_QTNETWORK_LIBRARY}
${QT_QTSQL_LIBRARY}
@@ -116,8 +79,8 @@
${KDE4_KDE3SUPPORT_LIBS}
${KDE4_KUTILS_LIBS}
smokekde
- smokeqt )
-
+ smokeqt
+)
set_target_properties(smokekhtml PROPERTIES VERSION 2.0.0 SOVERSION 2 )
install(TARGETS smokekhtml DESTINATION ${LIB_INSTALL_DIR} )
install(FILES ${CMAKE_SOURCE_DIR}/smoke/khtml_smoke.h DESTINATION include/smoke)
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic