upgrade cmake building system

Signed-off-by: gregory guy <g-gregory@gmx.fr>

CMakeLists.txt

@@ -15,17 +15,17 @@ cmake_minimum_required( VERSION 2.8 )
 ##### general package setup #####################
 
 project( tdewebdev )
+set( VERSION R14.1.0 )
 
 
 ##### include essential cmake modules ###########
 
+include( FindPkgConfig          )
+include( CheckFunctionExists    )
+include( CheckIncludeFile       )
+include( CheckLibraryExists     )
+include( CheckCSourceCompiles   )
 include( CheckCXXSourceCompiles )
-include( CheckFunctionExists )
-include( CheckIncludeFileCXX )
-include( CheckStructHasMember )
-include( CheckSymbolExists )
-include( CheckTypeSize )
-include( FindPkgConfig )
 
 
 ##### include our cmake modules #################
@@ -48,10 +48,19 @@ tde_setup_paths( )
 # option( WITH_LIBGPOD "Enable iPod support from libgpod" OFF )
 
 
-##### user requested modules ####################
+##### optional stuff
 
-option( BUILD_ALL "Build all" OFF )
+option( WITH_ALL_OPTIONS "Enable all optional support" OFF                                          )
+option( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden" ${WITH_ALL_OPTIONS} )
+
+
+##### user requested modules
+
+option( BUILD_ALL "Build all" ON                             )
+option( BUILD_DOC "Build documentation" ${BUILD_ALL}         )
+option( BUILD_TRANSLATIONS "Build translations" ${BUILD_ALL} )
 option( BUILD_QUANTA "Build quanta" ${BUILD_ALL} )
+option( BUILD_KIMAGEMAPEDITOR "Build kimagemapeditor" ${BUILD_ALL} )
 
 
 ##### configure checks ##########################
@@ -61,23 +70,19 @@ include( ConfigureChecks.cmake )
 
 ###### global compiler settings #################
 
-add_definitions(
-  -DHAVE_CONFIG_H
-  ${TQT_CFLAGS_OTHER}
-)
+add_definitions( -DHAVE_CONFIG_H -UTQT_NO_ASCII_CAST )
 
-set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -include tqt.h" )
+set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TQT_CXX_FLAGS}" )
 set( CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined" )
 set( CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--no-undefined" )
 
 
 ##### source directories ########################
 
-if( BUILD_QUANTA )
-  add_subdirectory( lib )
-endif( )
-
+tde_conditional_add_subdirectory( BUILD_QUANTA lib )
 tde_conditional_add_subdirectory( BUILD_QUANTA quanta )
+tde_conditional_add_subdirectory( BUILD_KIMAGEMAPEDITOR kimagemapeditor )
+tde_conditional_add_subdirectory( BUILD_DOC doc         )
 
 
 ##### write configure files #####################

ConfigureChecks.cmake

@@ -9,18 +9,26 @@
 #
 #################################################
 
-##### check for gcc visibility support #########
-# FIXME
-# This should check for [T]Qt3 visibility support
+# required stuff
+find_package( TQt )
+find_package( TDE )
+
+tde_setup_architecture_flags( )
+
+include(TestBigEndian)
+test_big_endian(WORDS_BIGENDIAN)
+
+
+##### check for gcc visibility support
 
 if( WITH_GCC_VISIBILITY )
   if( NOT UNIX )
-    tde_message_fatal(FATAL_ERROR "\ngcc visibility support was requested, but your system is not *NIX" )
+    tde_message_fatal( "gcc visibility support was requested, but your system is not *NIX" )
   endif( NOT UNIX )
   set( __KDE_HAVE_GCC_VISIBILITY 1 )
   set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden -fvisibility-inlines-hidden")
   set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -fvisibility-inlines-hidden")
-endif( )
+endif( WITH_GCC_VISIBILITY )
 
 
 # libxml-2.0
@@ -43,9 +51,3 @@ if( BUILD_QUANTA )
     tde_message_fatal( "libxslt are required, but not found on your system" )
   endif( )
 endif( )
-
-
-# required stuff
-find_package( Qt )
-find_package( TQt )
-find_package( TDE )

config.h.cmake

@@ -0,0 +1,8 @@
+#define VERSION "@VERSION@"
+
+// Defined if you have fvisibility and fvisibility-inlines-hidden support.
+#cmakedefine __KDE_HAVE_GCC_VISIBILITY 1
+
+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
+   significant byte first (like Motorola and SPARC, unlike Intel). */
+#cmakedefine WORDS_BIGENDIAN @WORDS_BIGENDIAN@

doc/CMakeLists.txt

@@ -1,12 +1,2 @@
-#################################################
-#
-#  (C) 2012 Golubev Alexander
-#  fatzer2 (AT) gmail.com
-#
-#  Improvements and feedback are welcome
-#
-#  This file is released under GPL >= 2
-#
-#################################################
-
-tde_auto_add_subdirectories( )
+tde_conditional_add_subdirectory( BUILD_QUANTA quanta )
+tde_conditional_add_subdirectory( BUILD_KIMAGEMAPEDITOR kimagemapeditor )

doc/kimagemapeditor/CMakeLists.txt

@@ -0,0 +1 @@
+tde_create_handbook( DESTINATION kimagemapeditor )

doc/quanta/CMakeLists.txt

@@ -0,0 +1 @@
+tde_create_handbook( DESTINATION quanta )

kimagemapeditor/CMakeLists.txt

@@ -0,0 +1,72 @@
+add_subdirectory( pics )
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### kimagemapeditorcommon (static)
+
+tde_add_library( kimagemapeditorcommon STATIC_PIC AUTOMOC
+
+  SOURCES
+        qextfileinfo.cpp
+        areacreator.cpp
+        kimearea.cpp
+        kimecommands.cpp
+        kimedialogs.cpp
+        kimagemapeditor.cpp
+        drawzone.cpp
+        arealistview.cpp
+        imageslistview.cpp
+        mapslistview.cpp
+)
+
+
+##### libkimagemapeditor (kpart)
+
+tde_add_kpart( libkimagemapeditor AUTOMOC
+
+  SOURCES
+        dummy.cpp
+  LINK
+     tdehtml-shared
+
+  DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+
+##### kimagemapeditor (executable)
+
+tde_add_executable( kimagemapeditor AUTOMOC
+
+  SOURCES
+        main.cpp kimeshell.cpp
+  LINK
+     tdecore-shared tdeui-shared tdeio-shared tdehtml-shared
+     kimagemapeditorcommon-static
+
+  DESTINATION ${BIN_INSTALL_DIR}
+)
+# kjs tdefx  tdeparts DCOP
+
+##### other data
+
+install(
+    FILES kimagemapeditorui.rc kimagemapeditorpartui.rc
+    DESTINATION ${DATA_INSTALL_DIR}/kimagemapeditor
+)
+
+install(
+    FILES kimagemapeditor.desktop
+    DESTINATION ${XDG_APPS_INSTALL_DIR}
+)

kimagemapeditor/pics/CMakeLists.txt

@@ -0,0 +1,14 @@
+tde_install_icons( kimagemapeditor )
+
+
+##### other data ################################
+
+install(
+    FILES
+        addpointcursor.png
+        freehandcursor.png
+        polygoncursor.png
+        removepointcursor.png
+
+  DESTINATION ${DATA_INSTALL_DIR}/kimagemapeditor
+)

quanta/CMakeLists.txt

@@ -1,23 +1 @@
-#################################################
-#
-#  (C) 2010-2011 Serghei Amelian
-#  serghei (DOT) amelian (AT) gmail.com
-#
-#  Improvements and feedback are welcome
-#
-#  This file is released under GPL >= 2
-#
-#################################################
-
-add_subdirectory( data )
-add_subdirectory( utility )
-add_subdirectory( dialogs )
-add_subdirectory( components )
-add_subdirectory( parsers )
-add_subdirectory( treeviews )
-add_subdirectory( messages )
-add_subdirectory( plugins )
-add_subdirectory( parts )
-add_subdirectory( project )
-add_subdirectory( src )
-add_subdirectory( scripts )
+tde_auto_add_subdirectories( )