[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebindings/smoke/soprano
From:       Arno Rehn <kde () arnorehn ! de>
Date:       2009-09-06 15:17:02
Message-ID: 1252250222.895096.30358.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1020551 by arnorehn:

port smokesoprano to the new smokegenerator


 M  +5 -34     CMakeLists.txt  
 A             smokeconfig.xml  
 A             soprano_includes.h   [License: UNKNOWN]


--- trunk/KDE/kdebindings/smoke/soprano/CMakeLists.txt #1020550:1020551
@@ -2,9 +2,6 @@
 set(soprano_includes ${SOPRANO_INCLUDE_DIR})
 
 include_directories( ${QT_INCLUDES} ${SOPRANO_INCLUDE_DIR} )
-IF(NOT PERL_FOUND)
-    FIND_PACKAGE(PERL REQUIRED)
-ENDIF(NOT PERL_FOUND)
 
 ########### next target ###############
 
@@ -19,22 +16,12 @@
 	${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
+    COMMAND generator
+    ARGS -config "${CMAKE_CURRENT_BINARY_DIR}/../qt/config.xml" -smokeconfig \
"${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml" +         -I "${SOPRANO_INCLUDE_DIR}" \
-- ${CMAKE_CURRENT_SOURCE_DIR}/soprano_includes.h +    WORKING_DIRECTORY \
${CMAKE_CURRENT_BINARY_DIR})  
-	WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
-
 macro_add_file_dependencies( ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp \
${CMAKE_CURRENT_BINARY_DIR}/x_1.cpp )  
 include_directories (${CMAKE_SOURCE_DIR}/smoke ${CMAKE_SOURCE_DIR}/smoke/soprano )
@@ -49,17 +36,7 @@
 	${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_10.cpp)
 
 IF(CMAKE_CXX_FLAGS MATCHES "-fvisibility")
     ADD_DEFINITIONS(-DGCC_VISIBILITY)
@@ -72,9 +49,3 @@
 
 install(TARGETS smokesoprano DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} )
 install(FILES ${CMAKE_SOURCE_DIR}/smoke/soprano_smoke.h DESTINATION include/smoke)
-
-FOREACH(incname ${QT_INCLUDES} ${SOPRANO_INCLUDE_DIR})
-    SET(qt_incs "'${incname}', ${qt_incs}")
-ENDFOREACH(incname)
-
-configure_file(generate.pl.cmake ${CMAKE_CURRENT_BINARY_DIR}/generate.pl @ONLY)


[prev in list] [next in list] [prev in thread] [next in thread]