[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdebindings/smoke/kde
From: Arno Rehn <kde () arnorehn ! de>
Date: 2009-09-13 17:23:18
Message-ID: 1252862598.334271.8022.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 1022994 by arnorehn:
make smokekde use the new smokegenerator
M +40 -74 CMakeLists.txt
A config.xml.cmake
A kde_includes.h [License: UNKNOWN]
A smokeconfig.xml
--- trunk/KDE/kdebindings/smoke/kde/CMakeLists.txt #1022993:1022994
@@ -1,60 +1,41 @@
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)
+configure_file(config.xml.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.xml @ONLY)
-
########### 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}/config.xml" -smokeconfig \
"${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml" + -- \
${CMAKE_CURRENT_SOURCE_DIR}/kde_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(smokekde_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
@@ -75,47 +56,32 @@
${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(smokekde SHARED ${smokekde_LIB_SRCS})
-target_link_libraries(smokekde
- ${QT_QTNETWORK_LIBRARY}
- ${QT_QTSQL_LIBRARY}
- ${QT_QTOPENGL_LIBRARY}
- ${QT_QTXML_LIBRARY}
- ${QT_QTSVG_LIBRARY}
- ${KDE4_KDECORE_LIBS}
+add_dependencies(smokekde smokeqt)
+
+target_link_libraries(smokekde
+ ${QT_QTNETWORK_LIBRARY}
+ ${QT_QTSQL_LIBRARY}
+ ${QT_QTOPENGL_LIBRARY}
+ ${QT_QTXML_LIBRARY}
+ ${QT_QTSVG_LIBRARY}
+ ${KDE4_KDECORE_LIBS}
${KDE4_KDEUI_LIBS}
- ${KDE4_KIO_LIBS}
+ ${KDE4_KIO_LIBS}
${KDE4_KNEWSTUFF2_LIBS}
${KDE4_KPTY_LIBS}
${KDE4_KUTILS_LIBS}
${KDE4_KPARTS_LIBS}
${KDE4_KFILE_LIBS}
- smokeqt )
+ smokeqt
+)
set_target_properties(smokekde PROPERTIES VERSION 2.0.0 SOVERSION 2 )
install(TARGETS smokekde DESTINATION ${LIB_INSTALL_DIR} )
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic