[Kde-bindings] KDE/kdebindings/smoke

[Richard Dale]

SVN commit 807999 by rdale:

* Only generate the 'qtdefines' file once when generating the smoke lib for qt, and put it in the
  kdebindings/smoke directory

CCMAIL: kde-bindings at kde.org

 M  +8 -0      CMakeLists.txt  
 M  +0 -9      kde/CMakeLists.txt  
 M  +1 -1      kde/generate.pl.cmake  
 M  +0 -7      qsci/CMakeLists.txt  
 M  +1 -1      qsci/generate.pl.cmake  
 M  +1 -1      qt/CMakeLists.txt  
 M  +1 -1      qt/generate.pl.cmake  
 M  +1 -1      qt/qtguess.pl.cmake  


--- trunk/KDE/kdebindings/smoke/CMakeLists.txt #807998:807999
@@ -19,8 +19,16 @@
 
 endif(ENABLE_SMOKE OR ENABLE_SMOKEQSCI OR ENABLE_SMOKEKDE)
 
+# for qtguess.pl
+if (APPLE)
+set(qt_test_threshold 15)
+else (APPLE)
+set(qt_test_threshold 10)
+endif (APPLE)
+
 message(STATUS "Build Smoke... " ${SMOKE_ENABLED})
 
+
 ########### install files ###############
 
 # KDE specific
--- trunk/KDE/kdebindings/smoke/kde/CMakeLists.txt #807998:807999
@@ -17,10 +17,8 @@
 
 # for qtguess.pl
 if (APPLE)
-set(qt_test_threshold 15)
 set(qtflags "-framework QtCore -framework QtGui")
 else (APPLE)
-set(qt_test_threshold 10)
 set(qtflags "-lQtCore -lQtGui")
 endif (APPLE)
 FOREACH(filename ${QT_INCLUDES})
@@ -28,9 +26,6 @@
 ENDFOREACH(filename)
 
 
-# macro is defined in qt-copy/src/qbase.pri but couldn't be found by qtguess, so I append it manually
-file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/qtdefines "QT_NO_CAST_TO_ASCII\n")
-
 ########### next target ###############
 
 add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp 
@@ -55,9 +50,6 @@
                 ${CMAKE_CURRENT_BINARY_DIR}/x_19.cpp
                 ${CMAKE_CURRENT_BINARY_DIR}/x_20.cpp
 
-                  COMMAND ${PERL_EXECUTABLE} ARGS ${CMAKE_CURRENT_BINARY_DIR}/qtguess.pl
-                  DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/qtguess.pl
-
                   COMMAND ${PERL_EXECUTABLE} ARGS ${CMAKE_CURRENT_BINARY_DIR}/generate.pl
                   DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/generate.pl
                   WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
@@ -111,7 +103,6 @@
 ENDFOREACH(libname)
 
 configure_file(generate.pl.cmake ${CMAKE_CURRENT_BINARY_DIR}/generate.pl @ONLY )
-configure_file(qtguess.pl.cmake ${CMAKE_CURRENT_BINARY_DIR}/qtguess.pl @ONLY)
 
 kde4_add_library(smokekde SHARED ${smokekde_LIB_SRCS})
 
--- trunk/KDE/kdebindings/smoke/kde/generate.pl.cmake #807998:807999
@@ -16,7 +16,7 @@
 my $finaloutdir = $here;
 my $defines = "qtdefines";
 my $headerlist = "@CMAKE_CURRENT_SOURCE_DIR@/header_list";
-my $definespath = "$here/$defines";
+my $definespath = "$here/../$defines";
 my $headerlistpath = "$headerlist";
 
 my $kdeheaderlist = "@CMAKE_CURRENT_SOURCE_DIR@/kde_header_list";
--- trunk/KDE/kdebindings/smoke/qsci/CMakeLists.txt #807998:807999
@@ -6,12 +6,6 @@
     FIND_PACKAGE(PERL REQUIRED)
 ENDIF(NOT PERL_FOUND)
 
-# for qtguess.pl
-set(qt_test_threshold 10)
-
-# macro is defined in qt-copy/src/qbase.pri but couldn't be found by qtguess, so I append it manually
-file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/qtdefines "QT_NO_CAST_TO_ASCII\n")
-
 ########### next target ###############
 
 add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp
@@ -86,5 +80,4 @@
     SET(qt_incs "'${incname}', ${qt_incs}")
 ENDFOREACH(incname)
 
-configure_file(qtguess.pl.cmake ${CMAKE_CURRENT_BINARY_DIR}/qtguess.pl @ONLY)
 configure_file(generate.pl.cmake ${CMAKE_CURRENT_BINARY_DIR}/generate.pl @ONLY)
--- trunk/KDE/kdebindings/smoke/qsci/generate.pl.cmake #807998:807999
@@ -16,7 +16,7 @@
 my $finaloutdir = $here;
 my $defines = "qtdefines";
 my $headerlist = "@CMAKE_CURRENT_SOURCE_DIR@/header_list";
-my $definespath = "$here/$defines";
+my $definespath = "$here/../$defines";
 my $headerlistpath = "$headerlist";
 my $qscintilla_headerlist = "";
 my $qscintilla_headerlistpath = "";
--- trunk/KDE/kdebindings/smoke/qt/CMakeLists.txt #807998:807999
@@ -33,7 +33,7 @@
 endif (APPLE)
 
 # macro is defined in qt-copy/src/qbase.pri but couldn't be found by qtguess, so I append it manually
-file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/qtdefines "QT_NO_CAST_TO_ASCII\n")
+file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/../qtdefines "QT_NO_CAST_TO_ASCII\n")
 
 ########### next target ###############
 
--- trunk/KDE/kdebindings/smoke/qt/generate.pl.cmake #807998:807999
@@ -16,7 +16,7 @@
 my $finaloutdir = $here;
 my $defines = "qtdefines";
 my $headerlist = "@CMAKE_CURRENT_SOURCE_DIR@/header_list";
-my $definespath = "$here/$defines";
+my $definespath = "$here/../$defines";
 my $headerlistpath = "$headerlist";
 my $qscintilla_headerlist = "";
 my $qscintilla_headerlistpath = "";
--- trunk/KDE/kdebindings/smoke/qt/qtguess.pl.cmake #807998:807999
@@ -54,7 +54,7 @@
 map{ $tests{$_}->[2]>=$threshold ? ($used++, $total++):$total++ } keys %tests;
 
 print "Number of defines to be tested : $used/$total\n\n" unless $opt_q;
-open( QTDEFS, ">>".($opt_o || "qtdefines") ) or die "Can't open output file: $!\n";
+open( QTDEFS, ">>".($opt_o || "../qtdefines") ) or die "Can't open output file: $!\n";
 
 grab_qglobal_symbols();
 preliminary_test();