[Kst] branches/work/kst/portto4/kst

Adam Treat treat at kde.org
Thu Feb 15 20:29:45 CET 2007


SVN commit 633921 by treat:

* Add placeholder for config checks, create ksttimers.h properly, misc
cmake build stuff


 M  +15 -3     CMakeLists.txt  
 A             ConfigureChecks.cmake  
 A             config.h.cmake  
 M  +3 -4      src/libkst/CMakeLists.txt  
 A             src/libkst/ksttimers.h.cmake   src/libkst/ksttimers.h.in#633709


--- branches/work/kst/portto4/kst/CMakeLists.txt #633920:633921
@@ -1,11 +1,23 @@
+project(kst)
+find_package(KDE4 REQUIRED)
 
+include(KDE4Defaults)
+include(MacroLibrary)
+
+add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS} -DHAVE_CONFIG_H=1)
+
+link_directories(${KDE4_LIB_DIR})
+
+include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES} ${QT_INCLUDES})
+
+# create config.h
+include(ConfigureChecks.cmake)
+configure_file(config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h )
+
 add_subdirectory( src )
 #add_subdirectory( misc )
 #add_subdirectory( tests )
 
-include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES}  )
-
-
 ########### install files ###############
 
 
--- branches/work/kst/portto4/kst/src/libkst/CMakeLists.txt #633920:633921
@@ -1,20 +1,19 @@
 
 FIND_PACKAGE(KDE4 REQUIRED)
-# configure_file(${CMAKE_CURRENT_SOURCE_DIR}/ksttimers.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/ksttimers.h )
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/ksttimers.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/ksttimers.h )
 
 include_directories( ${CMAKE_SOURCE_DIR}/kst/src/extdate ${KDE4_INCLUDE_DIR} ${QT_INCLUDES}  )
 
-
 ########### next target ###############
 
 set(kst_LIB_SRCS 
-   ksdebug.cpp 
+#    ksdebug.cpp 
    kstobject.cpp 
    kstdatasource.cpp 
    stdinsource.cpp 
    kstextension.cpp 
    kstdatacollection.cpp 
-   kstdebug.cpp 
+#    kstdebug.cpp 
    rwlock.cpp 
    kstmath.cpp 
    kstdateparser.cpp 


More information about the Kst mailing list