Compare commits

...

15 Commits

Author SHA1 Message Date
Michele Calgaro 724e4c4b11
Use TDE cmake macro to set version
3 years ago
Michele Calgaro 7ab2e21aba
Remove obsolete setting of CMAKE_MODULE_PATH in cmake files.
3 years ago
Slávek Banko 8dab5441ae
Update version number to the upcoming R14.0.13.
3 years ago
Slávek Banko 9f56ebf48b
Raise the minimum required version of CMake to 3.1.
3 years ago
Slávek Banko ddeb07f10f
cmake: Install the library to the default system location.
3 years ago
Slávek Banko 31b96d933f
Added controlled conversions to char* instead of automatic ascii conversions.
3 years ago
Slávek Banko a4cbbd1ec3
cmake: Setting the WITH_GCC_VISIBILITY option has no effect.
3 years ago
Slávek Banko 8d464c8f6c
cmake: Do not install private headers.
3 years ago
Slávek Banko 69b6fb9316
cmake: Set the path for installing API documentation.
3 years ago
Slávek Banko 2c89222ed3
Fix library version in pkg-config file.
3 years ago
Slávek Banko 379367890c
cmake: Install the library to the default system location.
3 years ago
gregory guy bf076238d3
Conversion to the cmake building system.
3 years ago
Michele Calgaro 8081a13a66
Removed unnecessary executable flag. This relates to bug 2153.
6 years ago
Timothy Pearson e8c412f994 Fix invalid headers in PNG files and optimize for size
9 years ago
Slávek Banko f0c1f70821 Fix incorrectly renamed strings
10 years ago

@ -0,0 +1,103 @@
############################################
# #
# Improvements and feedbacks are welcome #
# #
# This file is released under GPL >= 3 #
# #
############################################
cmake_minimum_required( VERSION 3.1 )
#### general package setup
project( tqscintilla )
#### include essential cmake modules
include( FindPkgConfig )
include( CheckFunctionExists )
include( CheckSymbolExists )
include( CheckIncludeFile )
include( CheckLibraryExists )
include( CheckCSourceCompiles )
include( CheckCXXSourceCompiles )
include( GNUInstallDirs OPTIONAL )
#### include our cmake modules
include( TDEMacros )
##### set version number ########################
tde_set_project_version( )
##### setup install paths
if( CMAKE_INSTALL_LIBDIR )
tde_setup_install_path( LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}" )
endif()
tde_setup_install_path( HTML_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/share/doc/lib${PROJECT_NAME}/HTML" )
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} )
##### user requested modules
option( BUILD_ALL "Build all" ON )
option( BUILD_PLUGIN "Build qscintilla plugin" ${BUILD_ALL} )
option( BUILD_DOC "Build documentation" ${BUILD_ALL} )
##### 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 )
add_subdirectory( qt )
tde_conditional_add_subdirectory( BUILD_PLUGIN designer )
tde_conditional_add_project_docs( BUILD_DOC )
##### write configure files
configure_file( config.h.cmake config.h @ONLY )
# pkg-config
set( prefix ${CMAKE_INSTALL_PREFIX} )
string( REGEX REPLACE "^${CMAKE_INSTALL_PREFIX}" "\${prefix}" PC_EXEC_PREFIX ${EXEC_INSTALL_PREFIX} )
string( REGEX REPLACE "^${CMAKE_INSTALL_PREFIX}" "\${prefix}" PC_INCLUDE_DIR ${TQT_INCLUDES_DIR} )
string( REGEX REPLACE "^${CMAKE_INSTALL_PREFIX}" "\${prefix}" PC_LIB_DIR ${LIB_INSTALL_DIR} )
configure_file( qscintilla.pc.cmake qscintilla.pc @ONLY )
install(
FILES ${CMAKE_CURRENT_BINARY_DIR}/qscintilla.pc
DESTINATION ${PKGCONFIG_INSTALL_DIR}
)

@ -0,0 +1,60 @@
###########################################
# #
# Improvements and feedback are welcome #
# #
# This file is released under GPL >= 3 #
# #
###########################################
# required stuff
find_package( TQt )
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 tqt3 plugins location
execute_process(
COMMAND ${PKG_CONFIG_EXECUTABLE} tqt-mt --variable=pluginsdir
OUTPUT_VARIABLE _pluginsdir
RESULT_VARIABLE _result
OUTPUT_STRIP_TRAILING_WHITESPACE
)
set( TQT_PLUGINS_DIR ${_pluginsdir} )
message( STATUS "TQT plugins directory: ${TQT_PLUGINS_DIR}" )
##### Look for tqt3 translations location
execute_process(
COMMAND ${PKG_CONFIG_EXECUTABLE} tqt-mt --variable=translationsdir
OUTPUT_VARIABLE _translationsdir
RESULT_VARIABLE _result
OUTPUT_STRIP_TRAILING_WHITESPACE
)
set( TQT_TRANSLATIONS_DIR ${_translationsdir} )
message( STATUS "TQT translation directory: ${TQT_TRANSLATIONS_DIR}" )
##### Look for tqt3 includes location
execute_process(
COMMAND ${PKG_CONFIG_EXECUTABLE} tqt-mt --variable=includedir
OUTPUT_VARIABLE _includedir
RESULT_VARIABLE _result
OUTPUT_STRIP_TRAILING_WHITESPACE
)
set( TQT_INCLUDES_DIR ${_includedir} )
message( STATUS "TQT include directory: ${TQT_INCLUDES_DIR}" )

@ -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@

@ -0,0 +1,24 @@
include_directories(
${CMAKE_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
${TQT_INCLUDE_DIRS}
${CMAKE_SOURCE_DIR}/qt
)
link_directories(
${TQT_LIBRARY_DIRS}
)
##### qscintillaplugin (shared)
tde_add_library( qscintillaplugin SHARED
SOURCES
qscintillaplugin.cpp
LINK
qscintilla-shared
DESTINATION ${TQT_PLUGINS_DIR}/designer
)

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 943 B

Before

Width:  |  Height:  |  Size: 35 B

After

Width:  |  Height:  |  Size: 35 B

Before

Width:  |  Height:  |  Size: 706 B

After

Width:  |  Height:  |  Size: 706 B

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.5 KiB

Before

Width:  |  Height:  |  Size: 6.0 KiB

After

Width:  |  Height:  |  Size: 6.0 KiB

@ -0,0 +1,24 @@
include_directories(
${CMAKE_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
${TQT_INCLUDE_DIRS}
${CMAKE_SOURCE_DIR}/qt
${CMAKE_SOURCE_DIR}/src
)
link_directories(
${TQT_LIBRARY_DIRS}
)
##### app (executable)
tde_add_executable( app AUTOMOC
SOURCES
application.cpp
main.cpp
LINK
qscintilla-shared
)

@ -18,7 +18,7 @@
#include <tqmenubar.h>
#include <tqfile.h>
#include <tqfiledialog.h>
#include <statusbar.h>
#include <tqstatusbar.h>
#include <tqmessagebox.h>
#include <tqprinter.h>
#include <tqapplication.h>
@ -269,3 +269,5 @@ void ApplicationWindow::aboutTQt()
{
TQMessageBox::aboutTQt( this, "TQScintilla Application Example" );
}
#include "application.moc"

@ -0,0 +1,14 @@
prefix=@CMAKE_INSTALL_PREFIX@
exec_prefix=@PC_EXEC_PREFIX@
libdir=@PC_LIB_DIR@
includedir=@PC_INCLUDE_DIR@
pkglibdir=${libdir}
pkgincludedir=${includedir}
Name: @PROJECT_NAME@
Version: 1.7.1
Description: @PROJECT_NAME@ is a source code editing library for TDE.
Cflags: -I${includedir}
Libs: -L${libdir} -lqscintilla

@ -0,0 +1,80 @@
include_directories(
${CMAKE_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
${TQT_INCLUDE_DIRS}
${CMAKE_SOURCE_DIR}/include
${CMAKE_SOURCE_DIR}/src
)
link_directories(
${TQT_LIBRARY_DIRS}
)
add_definitions( -DQT )
##### qscintilla (shared)
tde_add_library( qscintilla SHARED AUTOMOC
SOURCES
qextscintilla.cpp
qextscintillaapis.cpp
qextscintillabase.cpp
qextscintillacommand.cpp
qextscintillacommandset.cpp
qextscintilladocument.cpp
qextscintillalexer.cpp
qextscintillalexerbash.cpp
qextscintillalexerbatch.cpp
qextscintillalexercpp.cpp
qextscintillalexercsharp.cpp
qextscintillalexercss.cpp
qextscintillalexerdiff.cpp
qextscintillalexerhtml.cpp
qextscintillalexeridl.cpp
qextscintillalexerjava.cpp
qextscintillalexerjavascript.cpp
qextscintillalexerlua.cpp
qextscintillalexermakefile.cpp
qextscintillalexerperl.cpp
qextscintillalexerpov.cpp
qextscintillalexerproperties.cpp
qextscintillalexerpython.cpp
qextscintillalexerruby.cpp
qextscintillalexersql.cpp
qextscintillalexertex.cpp
qextscintillamacro.cpp
qextscintillaprinter.cpp
SciListBox.cpp
PlatQt.cpp
ScintillaQt.cpp
LINK
${TQT_LIBRARIES}
src-static
VERSION 7.0.1
DESTINATION ${LIB_INSTALL_DIR}
)
###### other data
# translations
file( GLOB _translations RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} qscintilla_*.qm )
install(
FILES ${_translations}
DESTINATION ${TQT_TRANSLATIONS_DIR}
)
# headers
file( GLOB _includes RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} qextscintilla*.h )
install(
FILES ${_includes}
DESTINATION ${TQT_INCLUDES_DIR}
)

@ -19,6 +19,9 @@
// TQScintilla; see the file LICENSE. If not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#include <stdio.h>
#include <stdarg.h>
@ -816,7 +819,7 @@ ColourDesired Platform::ChromeHighlight()
const char *Platform::DefaultFont()
{
return TQApplication::font().family();
return TQApplication::font().family().utf8();
}
int Platform::DefaultFontSize()

@ -20,6 +20,9 @@
// TQScintilla; see the file LICENSE. If not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#include <stdlib.h>
#include <string.h>
@ -326,3 +329,5 @@ void SciListBox::handleDoubleClick(TQListBoxItem *)
if (lbx && lbx -> cb_action)
lbx -> cb_action(lbx -> cb_data);
}
#include "SciListBox.moc"

@ -19,6 +19,9 @@
// TQScintilla; see the file LICENSE. If not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#include <tqapplication.h>
#include <tqscrollbar.h>

@ -21,6 +21,9 @@
// TQScintilla; see the file LICENSE. If not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#include <string.h>
#include <tqapplication.h>
@ -3029,3 +3032,5 @@ void QextScintilla::handleUserListSelection(const char *text, int id)
{
emit userListActivated(id, TQString(text));
}
#include "qextscintilla.moc"

@ -19,6 +19,9 @@
// TQScintilla; see the file LICENSE. If not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#include <tqfile.h>
#include <tqregexp.h>

@ -19,7 +19,11 @@
// TQScintilla; see the file LICENSE. If not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#include "qextscintillabase.moc"
#include <tqapplication.h>
#include <tqclipboard.h>
#include <tqscrollbar.h>

@ -19,6 +19,9 @@
// TQScintilla; see the file LICENSE. If not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#include <tqnamespace.h>
#include <tqapplication.h>

@ -19,6 +19,9 @@
// TQScintilla; see the file LICENSE. If not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#include <tqsettings.h>

@ -19,6 +19,9 @@
// TQScintilla; see the file LICENSE. If not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#include "qextscintilladocument.h"
#include "qextscintillabase.h"

@ -46,8 +46,10 @@
#else
#if __GNUC__ >= 4
#if defined(__KDE_HAVE_GCC_VISIBILITY)
#define TQEXTSCINTILLA_EXPORT __attribute__ ((visibility("default")))
#else
#define TQEXTSCINTILLA_EXPORT
#endif
#endif

@ -19,6 +19,9 @@
// TQScintilla; see the file LICENSE. If not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#include <tqapplication.h>
#include <tqcolor.h>
@ -442,3 +445,5 @@ void QextScintillaLexer::setPaper(const TQColor &c,int style)
emit paperChanged(c,QextScintillaBase::STYLE_DEFAULT);
}
}
#include "qextscintillalexer.moc"

@ -19,6 +19,9 @@
// TQScintilla; see the file LICENSE. If not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#include <tqcolor.h>
#include <tqfont.h>
@ -367,3 +370,5 @@ void QextScintillaLexerBash::setCompactProp()
{
emit propertyChanged("fold.compact",(fold_compact ? "1" : "0"));
}
#include "qextscintillalexerbash.moc"

@ -19,6 +19,9 @@
// TQScintilla; see the file LICENSE. If not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#include <tqcolor.h>
#include <tqfont.h>
@ -196,3 +199,5 @@ TQColor QextScintillaLexerBatch::paper(int style) const
return QextScintillaLexer::paper(style);
}
#include "qextscintillalexerbatch.moc"

@ -19,6 +19,9 @@
// TQScintilla; see the file LICENSE. If not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#include <tqcolor.h>
#include <tqfont.h>
@ -513,3 +516,5 @@ void QextScintillaLexerCPP::setStylePreprocProp()
{
emit propertyChanged("style.within.preprocessor",(style_preproc ? "1" : "0"));
}
#include "qextscintillalexercpp.moc"

@ -19,6 +19,9 @@
// TQScintilla; see the file LICENSE. If not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#include <tqcolor.h>
#include <tqfont.h>
@ -116,3 +119,5 @@ TQColor QextScintillaLexerCSharp::paper(int style) const
return QextScintillaLexer::paper(style);
}
#include "qextscintillalexercsharp.moc"

@ -19,6 +19,9 @@
// TQScintilla; see the file LICENSE. If not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#include <tqcolor.h>
#include <tqfont.h>
@ -374,3 +377,5 @@ void QextScintillaLexerCSS::setCompactProp()
{
emit propertyChanged("fold.compact",(fold_compact ? "1" : "0"));
}