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

List:       kde-commits
Subject:    KDE/kdebindings
From:       Raymond Wooninck <tittiatcoke () gmail ! com>
Date:       2010-11-26 19:16:44
Message-ID: 20101126191644.EF963AC8A3 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1201108 by rwooninck:

Make sure that kdebindings builds again based on the new structure under smoke

 M  +1 -1      csharp/qyoto/CMakeLists.txt  
 M  +1 -1      ruby/qtruby/src/CMakeLists.txt  
 M  +1 -1      smoke/kde/CMakeLists.txt  
 M  +2 -2      smoke/qt/CMakeLists.txt  
 M  +1 -1      smoke/qt/qtcore/CMakeLists.txt  


--- trunk/KDE/kdebindings/csharp/qyoto/CMakeLists.txt #1201107:1201108
@@ -41,7 +41,7 @@
     opengl/*.cs
     qdbus/*.cs)
 
-INCLUDE_DIRECTORIES (${QT_INCLUDES} ${CMAKE_SOURCE_DIR}/smoke \
${CMAKE_CURRENT_SOURCE_DIR}/src) +INCLUDE_DIRECTORIES (${QT_INCLUDES} \
${CMAKE_SOURCE_DIR}/smoke/qt ${CMAKE_CURRENT_SOURCE_DIR}/src)  LINK_DIRECTORIES \
(${LIBRARY_OUTPUT_PATH})  
 ADD_LIBRARY (qyoto SHARED ${SRC_QYOTO})
--- trunk/KDE/kdebindings/ruby/qtruby/src/CMakeLists.txt #1201107:1201108
@@ -13,7 +13,7 @@
     ADD_DEFINITIONS (-DRUBY_VERSION=0x${RUBY_VERSION_NUMBER})
 ENDIF(RUBY_VERSION)
 
-include_directories( ${CMAKE_SOURCE_DIR}/smoke ${RUBY_INCLUDE_DIRS} )
+include_directories( ${CMAKE_SOURCE_DIR}/smoke/qt ${RUBY_INCLUDE_DIRS} )
 INCLUDE_DIRECTORIES (${QT_INCLUDES})
 
 
--- trunk/KDE/kdebindings/smoke/kde/CMakeLists.txt #1201107:1201108
@@ -5,7 +5,7 @@
 include(MacroLibrary)
 include(MacroOptionalAddBindings)
 
-include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/generator)
 
 add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS} -DQT3_SUPPORT)
 include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES})
--- trunk/KDE/kdebindings/smoke/qt/CMakeLists.txt #1201107:1201108
@@ -2,7 +2,7 @@
 
 add_definitions(-DSMOKE_BUILDING)
 
-include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/generator)
 
 macro_optional_find_package(LibAttica)
 macro_log_feature(LIBATTICA_FOUND "libattica" "LibAttica" "http://www.kde.org" FALSE \
"" "Needed to compile libattica bindings") @@ -52,4 +52,4 @@
 set(qt_test_threshold 10)
 endif (APPLE)
 
-macro_display_bindings_log()
\ No newline at end of file
+macro_display_bindings_log()
--- trunk/KDE/kdebindings/smoke/qt/qtcore/CMakeLists.txt #1201107:1201108
@@ -85,4 +85,4 @@
 install(TARGETS smokeqtcore DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} )
 install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../qtcore_smoke.h DESTINATION \
include/smoke)  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/qt-config.xml DESTINATION \
                share/smokegen)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/../../../qtdefines DESTINATION \
share/smokegen) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/../../qtdefines \
DESTINATION share/smokegen)


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