diff --git a/CMakeLists.txt b/CMakeLists.txt index b4460e6c..e2fac388 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,75 +1,74 @@ #set( KTECHLAB_DEVELOPER_BUILD "true" ) project( ktechlab ) set( VERSION 0.3.6 ) find_package(Qt4 4.6.0 REQUIRED) find_package(KDE4 REQUIRED) include( ${CMAKE_SOURCE_DIR}/cmake/modules/FindGLIB.cmake ) include( ${CMAKE_SOURCE_DIR}/cmake/modules/FindGPSim.cmake ) #set(CMAKE_VERBOSE_MAKEFILE ON) add_definitions ( -DQT3_SUPPORT ) #add_definitions ( -DQT3_SUPPORT_WARNINGS ) if (KTECHLAB_DEVELOPER_BUILD) # for debugging with GCC 5 add_definitions( -fno-omit-frame-pointer ) set(SANITIZE_FLAGS " -fsanitize=address -fno-omit-frame-pointer ") # address #set(SANITIZE_FLAGS " -fsanitize=undefined -fno-omit-frame-pointer ") # undefined #set(SANITIZE_FLAGS "") # disabled add_definitions( ${SANITIZE_FLAGS} ) SET( CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${SANITIZE_FLAGS}" ) add_definitions( -Wold-style-cast ) # warn on old style casts. as these could introduce bugs endif (KTECHLAB_DEVELOPER_BUILD) set( CMAKE_REQUIRED_FLAGS -fexceptions ) add_definitions( -fno-inline ) # do not inline any method calls; this is useful for crash debugging add_definitions(${QT_DEFINITIONS} ${GLIB2_DEFINITIONS}${KDE4_DEFINITIONS}) # KDE disables STL compatibility by default; re-enabling it is supported # see http://kde.6490.n7.nabble.com/QT-NO-STL-in-KDE4-td1123882i20.html # and http://www.cmake.org/Wiki/HowToBuildKDE4Software#Some_useful_functions remove_definitions(-DQT_NO_STL) link_directories(${KDE4_LIB_DIR}) # not really needed, see FindKde4Internal.cmake if ( GPSIM_FOUND AND GLIB2_FOUND) include_directories( ${GLIB2_INCLUDE_DIRS} ) endif (GPSIM_FOUND AND GLIB2_FOUND) include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDE_DIR} ${QT_INCLUDE_DIR} ) CONFIGURE_FILE( ${CMAKE_SOURCE_DIR}/config.h.cmake ${CMAKE_BINARY_DIR}/config.h ) add_subdirectory( microbe ) add_subdirectory( src ) add_subdirectory( examples ) add_subdirectory( icons ) add_subdirectory( icons-kde3 ) -add_subdirectory( po ) add_subdirectory( doc ) add_subdirectory(tests) ########### install files ############### #original Makefile.am contents follow: #AUTOMAKE_OPTIONS = foreign 1.5 # #include admin/deps.am # #SUBDIRS=$(TOPSUBDIRS) diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index e00a50bb..c9381755 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -1,18 +1 @@ -message(STATUS "${CMAKE_CURRENT_SOURCE_DIR}: skipped subdir $(AUTODIRS)") -include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE3_INCLUDE_DIR} ${QT_INCLUDE_DIR} ) - - -########### install files ############### - - - - -#original Makefile.am contents follow: - -## the SUBDIRS is filled automatically by am_edit. If files are -## in this directory they are installed into the english dir -# -#KDE_LANG = en -#KDE_DOCS = AUTO -#SUBDIRS = $(AUTODIRS) -# +add_subdirectory( en ) diff --git a/doc/en/CMakeLists.txt b/doc/en/CMakeLists.txt index 6d97ba6a..17dbae96 100644 --- a/doc/en/CMakeLists.txt +++ b/doc/en/CMakeLists.txt @@ -1,17 +1 @@ -include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE3_INCLUDE_DIR} ${QT_INCLUDE_DIR} ) - - -########### install files ############### - - - - -#original Makefile.am contents follow: - -#KDE_DOCS = ktechlab -## KDE_MANS = ktechlab -#KDE_LANG = en -## KDE_DOCS = AUTO -# -#kde_docs_KDEDOCS = debugging.docbook circuits.docbook flowcode.docbook \ -# quick.docbook faq.docbook picprograms.docbook +kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR ktechlab)