From 0960d99962788d774d8df8924f1515a34f81e04b Mon Sep 17 00:00:00 2001 From: gregory guy Date: Mon, 25 May 2020 16:47:00 +0200 Subject: [PATCH] conversion to the cmake building system. Signed-off-by: gregory guy --- CMakeLists.txt | 69 +++++++++++++++++++++++++++++++++++++++++++ ConfigureChecks.cmake | 55 ++++++++++++++++++++++++++++++++++ config.h.cmake | 8 +++++ src/CMakeLists.txt | 27 +++++++++++++++++ src/plugin.c | 2 -- 5 files changed, 159 insertions(+), 2 deletions(-) create mode 100644 CMakeLists.txt create mode 100644 ConfigureChecks.cmake create mode 100644 config.h.cmake create mode 100644 src/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 0000000..a7d3c55 --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,69 @@ +############################################ +# # +# Improvements and feedbacks are welcome # +# # +# This file is released under GPL >= 3 # +# # +############################################ + + +cmake_minimum_required( VERSION 2.8 ) + + +#### general package setup + +project( kaffeine-mozilla ) +set( VERSION R14.1.0 ) + + +#### include essential cmake modules + +include( FindPkgConfig ) +include( CheckFunctionExists ) +include( CheckSymbolExists ) +include( CheckIncludeFile ) +include( CheckLibraryExists ) +include( CheckCSourceCompiles ) +include( CheckCXXSourceCompiles ) + + +#### include our cmake modules + +set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" ) +include( TDEMacros ) + + +##### setup install paths + +include( TDESetupPaths ) +tde_setup_paths( ) + + +##### optional stuff + +option( WITH_ALL_OPTIONS "Enable all optional support" OFF ) +option( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden" ${WITH_ALL_OPTIONS} ) + + +##### configure checks + +include( ConfigureChecks.cmake ) + + +###### global compiler settings + +add_definitions( -DHAVE_CONFIG_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" ) + + +##### directories + +add_subdirectory( src ) + + +##### write configure files + +configure_file( config.h.cmake config.h @ONLY ) diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake new file mode 100644 index 0000000..163bbfa --- /dev/null +++ b/ConfigureChecks.cmake @@ -0,0 +1,55 @@ +########################################### +# # +# Improvements and feedback are welcome # +# # +# This file is released under GPL >= 3 # +# # +########################################### + +tde_setup_architecture_flags( ) + +include(TestBigEndian) +test_big_endian(WORDS_BIGENDIAN) + +tde_setup_largefiles( ) + + +##### check for gcc visibility support + +if( WITH_GCC_VISIBILITY ) + tde_setup_gcc_visibility( ) +endif( WITH_GCC_VISIBILITY ) + + +##### look for X11 headers + +find_package( X11 ) + + +##### check for nspr + +pkg_search_module( NSPR nspr ) + +if( NSPR_FOUND ) + find_path( NSPR_INCLUDE_DIR nspr/prtypes.h ) + set( NSPR_INCLUDE_DIRS "${NSPR_INCLUDE_DIR}/nspr" ) + else() + tde_message_fatal( "nspr4 headers are required but were not found on your system" ) +endif() + + +##### check for libXaw(7) + +pkg_search_module( LIBXAW7 xaw7 ) + +if( LIBXAW7_FOUND ) + find_path( LIBXAW7_INCLUDE_DIR X11/Xaw/Box.h ) + set( LIBXAW7_INCLUDE_DIRS "${LIBXAW7_INCLUDE_DIR}" ) + else() + tde_message_fatal( "libXaw7 is required but was not found on your system" ) +endif() + + +##### check for the math libc + +find_library( MATH_LIBC m ) diff --git a/config.h.cmake b/config.h.cmake new file mode 100644 index 0000000..61ede3a --- /dev/null +++ b/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@ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt new file mode 100644 index 0000000..9061415 --- /dev/null +++ b/src/CMakeLists.txt @@ -0,0 +1,27 @@ + +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${NSPR_INCLUDE_DIRS} + ${X11_INCLUDE_DIR} + ${X11_Xt_INCLUDE_PATH} + ${LIBXAW7_INCLUDE_DIRS} +) + + +##### kaffeineplugin (module) + +tde_add_library( kaffeineplugin MODULE + + SOURCES + plugin.c + npunix.c + LINK + ${X11_LIBRARIES} + ${X11_Xt_LIB} + ${LIBXAW7_LIBRARIES} + ${MATH_LIBC} + + DESTINATION ${LIB_INSTALL_DIR}/mozilla/plugins +) diff --git a/src/plugin.c b/src/plugin.c index abab8ab..6e49a7d 100644 --- a/src/plugin.c +++ b/src/plugin.c @@ -64,8 +64,6 @@ #include #include -#include - #define XP_UNIX