[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [cantor] src/backends: Unify cmake files for backends and cmake code for unit tests
From: Nikita Sirgienko <null () kde ! org>
Date: 2018-08-17 22:38:02
Message-ID: E1fqnNa-0007nG-C3 () code ! kde ! org
[Download RAW message or body]
Git commit bd0780cc99082cfcd6e4fbe9e0575cb08ddfc573 by Nikita Sirgienko.
Committed on 17/08/2018 at 22:37.
Pushed by sirgienko into branch 'master'.
Unify cmake files for backends and cmake code for unit tests
M +7 -7 src/backends/R/CMakeLists.txt
M +19 -12 src/backends/julia/CMakeLists.txt
R +0 -0 src/backends/julia/testjulia.cpp [from: src/backends/julia/t=
ests/testjulia.cpp - 100% similarity]
R +0 -0 src/backends/julia/testjulia.h [from: src/backends/julia/tes=
ts/testjulia.h - 100% similarity]
D +0 -4 src/backends/julia/tests/CMakeLists.txt
M +6 -6 src/backends/kalgebra/CMakeLists.txt
M +15 -15 src/backends/lua/CMakeLists.txt
M +11 -12 src/backends/maxima/CMakeLists.txt
M +4 -4 src/backends/null/CMakeLists.txt
M +19 -18 src/backends/octave/CMakeLists.txt
M +14 -13 src/backends/python/CMakeLists.txt
M +7 -8 src/backends/python2/CMakeLists.txt
M +16 -10 src/backends/python3/CMakeLists.txt
R +0 -0 src/backends/python3/testpython3.cpp [from: src/backends/pyt=
hon3/tests/testpython3.cpp - 100% similarity]
R +0 -0 src/backends/python3/testpython3.h [from: src/backends/pytho=
n3/tests/testpython3.h - 100% similarity]
D +0 -4 src/backends/python3/tests/CMakeLists.txt
M +10 -10 src/backends/qalculate/CMakeLists.txt
M +9 -10 src/backends/sage/CMakeLists.txt
M +7 -7 src/backends/scilab/CMakeLists.txt
https://commits.kde.org/cantor/bd0780cc99082cfcd6e4fbe9e0575cb08ddfc573
diff --git a/src/backends/R/CMakeLists.txt b/src/backends/R/CMakeLists.txt
index f00ca147..545aa338 100644
--- a/src/backends/R/CMakeLists.txt
+++ b/src/backends/R/CMakeLists.txt
@@ -4,13 +4,13 @@ LINK_DIRECTORIES(${R_SHAREDLIBDIR})
add_subdirectory(rserver)
=
set( RBackend_SRCS
- rbackend.cpp
- rsession.cpp
- rexpression.cpp
- rextensions.cpp
- rcompletionobject.cpp
- rhighlighter.cpp
- rsettingswidget.cpp
+ rbackend.cpp
+ rsession.cpp
+ rexpression.cpp
+ rextensions.cpp
+ rcompletionobject.cpp
+ rhighlighter.cpp
+ rsettingswidget.cpp
)
=
kconfig_add_kcfg_files(RBackend_SRCS rserver/settings.kcfgc)
diff --git a/src/backends/julia/CMakeLists.txt b/src/backends/julia/CMakeLi=
sts.txt
index 4a16b115..5159dc63 100644
--- a/src/backends/julia/CMakeLists.txt
+++ b/src/backends/julia/CMakeLists.txt
@@ -1,18 +1,15 @@
include_directories(${JULIA_INCLUDE_DIRS})
=
add_subdirectory(juliaserver)
-if(BUILD_TESTING)
- add_subdirectory(tests)
-endif(BUILD_TESTING)
=
set(JuliaBackend_SRCS
- juliabackend.cpp
- juliasession.cpp
- juliaexpression.cpp
- juliakeywords.cpp
- juliahighlighter.cpp
- juliaextensions.cpp
- juliacompletionobject.cpp
+ juliabackend.cpp
+ juliasession.cpp
+ juliaexpression.cpp
+ juliakeywords.cpp
+ juliahighlighter.cpp
+ juliaextensions.cpp
+ juliacompletionobject.cpp
)
=
kconfig_add_kcfg_files(JuliaBackend_SRCS settings.kcfgc)
@@ -22,9 +19,19 @@ add_backend(juliabackend ${JuliaBackend_SRCS})
=
target_link_libraries(cantor_juliabackend Qt5::DBus ${JULIA_LIBRARY})
=
+if(BUILD_TESTING)
+ add_executable(testjulia testjulia.cpp)
+ add_test(NAME testjulia COMMAND testjulia)
+ target_link_libraries(testjulia =
+ Qt5::Test
+ cantorlibs =
+ cantortest
+ )
+endif(BUILD_TESTING)
+
install(FILES juliabackend.kcfg DESTINATION ${KDE_INSTALL_KCFGDIR})
file(GLOB scripts "${CMAKE_CURRENT_SOURCE_DIR}/scripts/*.jl")
install(
- FILES ${scripts}
- DESTINATION ${KDE_INSTALL_DATADIR}/cantor/juliabackend/scripts
+ FILES ${scripts}
+ DESTINATION ${KDE_INSTALL_DATADIR}/cantor/juliabackend/scripts
)
diff --git a/src/backends/julia/tests/testjulia.cpp b/src/backends/julia/te=
stjulia.cpp
similarity index 100%
rename from src/backends/julia/tests/testjulia.cpp
rename to src/backends/julia/testjulia.cpp
diff --git a/src/backends/julia/tests/testjulia.h b/src/backends/julia/test=
julia.h
similarity index 100%
rename from src/backends/julia/tests/testjulia.h
rename to src/backends/julia/testjulia.h
diff --git a/src/backends/julia/tests/CMakeLists.txt b/src/backends/julia/t=
ests/CMakeLists.txt
deleted file mode 100644
index d26b7ec2..00000000
--- a/src/backends/julia/tests/CMakeLists.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-add_executable(testjulia testjulia.cpp)
-target_link_libraries(testjulia ${QT_QTTEST_LIBRARY} cantorlibs cantortest)
-
-add_test(NAME testjulia COMMAND testjulia)
diff --git a/src/backends/kalgebra/CMakeLists.txt b/src/backends/kalgebra/C=
MakeLists.txt
index 1ae71f74..1f9ae396 100644
--- a/src/backends/kalgebra/CMakeLists.txt
+++ b/src/backends/kalgebra/CMakeLists.txt
@@ -1,10 +1,10 @@
set( KAlgebraBackend_SRCS
- kalgebrasyntaxhelpobject.cpp
- kalgebrabackend.cpp
- kalgebrasession.cpp
- kalgebraexpression.cpp
- kalgebracompletionobject.cpp
- kalgebraextensions.cpp
+ kalgebrasyntaxhelpobject.cpp
+ kalgebrabackend.cpp
+ kalgebrasession.cpp
+ kalgebraexpression.cpp
+ kalgebracompletionobject.cpp
+ kalgebraextensions.cpp
)
=
remove_definitions(-DQT_NO_CAST_TO_ASCII)
diff --git a/src/backends/lua/CMakeLists.txt b/src/backends/lua/CMakeLists.=
txt
index 50b14fd0..bb6e7fe8 100644
--- a/src/backends/lua/CMakeLists.txt
+++ b/src/backends/lua/CMakeLists.txt
@@ -1,11 +1,11 @@
set(LuaBackend_SRCS
- luabackend.cpp
- luasession.cpp
- luaexpression.cpp
- luacompletionobject.cpp
- luahelper.cpp
- luahighlighter.cpp
- luaextensions.cpp
+ luabackend.cpp
+ luasession.cpp
+ luaexpression.cpp
+ luacompletionobject.cpp
+ luahelper.cpp
+ luahighlighter.cpp
+ luaextensions.cpp
)
=
kconfig_add_kcfg_files(LuaBackend_SRCS settings.kcfgc)
@@ -20,14 +20,14 @@ include_directories(${LUAJIT_INCLUDE_DIR})
target_link_libraries(cantor_luabackend ${LUAJIT_LIBRARY})
=
if(BUILD_TESTING)
- add_executable( testlua testlua.cpp)
- add_test(testlua testlua)
- ecm_mark_as_test(testlua)
- target_link_libraries( testlua
- Qt5::Test
- cantorlibs
- cantortest
- )
+ add_executable( testlua testlua.cpp)
+ add_test(testlua testlua)
+ ecm_mark_as_test(testlua)
+ target_link_libraries( testlua
+ Qt5::Test
+ cantorlibs
+ cantortest
+ )
endif(BUILD_TESTING)
=
install(FILES cantor_lua.knsrc DESTINATION ${KDE_INSTALL_CONFDIR} )
diff --git a/src/backends/maxima/CMakeLists.txt b/src/backends/maxima/CMake=
Lists.txt
index 70125627..2ad6c4df 100644
--- a/src/backends/maxima/CMakeLists.txt
+++ b/src/backends/maxima/CMakeLists.txt
@@ -1,13 +1,13 @@
set( MaximaBackend_SRCS
- maximabackend.cpp
- maximasession.cpp
- maximaexpression.cpp
- maximaextensions.cpp
- maximahighlighter.cpp
- maximakeywords.cpp
- maximacompletionobject.cpp
- maximasyntaxhelpobject.cpp
- maximavariablemodel.cpp
+ maximabackend.cpp
+ maximasession.cpp
+ maximaexpression.cpp
+ maximaextensions.cpp
+ maximahighlighter.cpp
+ maximakeywords.cpp
+ maximacompletionobject.cpp
+ maximasyntaxhelpobject.cpp
+ maximavariablemodel.cpp
)
=
kconfig_add_kcfg_files(MaximaBackend_SRCS settings.kcfgc)
@@ -23,13 +23,12 @@ endif(NOT WIN32)
=
if(BUILD_TESTING)
add_executable( testmaxima testmaxima.cpp)
+ add_test(NAME testmaxima COMMAND testmaxima)
target_link_libraries( testmaxima
+ Qt5::Test
cantorlibs
cantortest
- ${QTTEST_LIBRARY}
)
-
- add_test(NAME testmaxima COMMAND testmaxima)
endif()
=
install( FILES cantor_maxima.knsrc DESTINATION ${KDE_INSTALL_CONFDIR} )
diff --git a/src/backends/null/CMakeLists.txt b/src/backends/null/CMakeList=
s.txt
index 92721ae5..5e0634dd 100644
--- a/src/backends/null/CMakeLists.txt
+++ b/src/backends/null/CMakeLists.txt
@@ -1,8 +1,8 @@
set( NullBackend_SRCS
- nullbackend.cpp
- nullsession.cpp
- nullexpression.cpp
- nullcompletionobject.cpp
+ nullbackend.cpp
+ nullsession.cpp
+ nullexpression.cpp
+ nullcompletionobject.cpp
)
=
add_backend(nullbackend ${NullBackend_SRCS})
diff --git a/src/backends/octave/CMakeLists.txt b/src/backends/octave/CMake=
Lists.txt
index 67b166e7..199ff319 100644
--- a/src/backends/octave/CMakeLists.txt
+++ b/src/backends/octave/CMakeLists.txt
@@ -1,11 +1,11 @@
set( OctaveBackend_SRCS
-octavebackend.cpp
-octavesession.cpp
-octaveexpression.cpp
-octaveextensions.cpp
-octavehighlighter.cpp
-octavecompletionobject.cpp
-octavesyntaxhelpobject.cpp
+ octavebackend.cpp
+ octavesession.cpp
+ octaveexpression.cpp
+ octaveextensions.cpp
+ octavehighlighter.cpp
+ octavecompletionobject.cpp
+ octavesyntaxhelpobject.cpp
)
=
set (OCTAVE_SCRIPT_INSTALL_DIR ${KDE_INSTALL_DATADIR}/cantor/octavebackend)
@@ -21,20 +21,21 @@ ki18n_wrap_ui(OctaveBackend_SRCS settings.ui)
add_backend(octavebackend ${OctaveBackend_SRCS})
=
target_link_libraries(cantor_octavebackend
- KF5::KIOCore
- KF5::ConfigCore
- KF5::ConfigGui)
+ KF5::KIOCore
+ KF5::ConfigCore
+ KF5::ConfigGui
+)
=
=
if(BUILD_TESTING)
- add_executable( testoctave testoctave.cpp)
- add_test(testoctave testoctave)
- ecm_mark_as_test(testoctave)
- target_link_libraries( testoctave
- Qt5::Test
- cantorlibs
- cantortest
- )
+ add_executable( testoctave testoctave.cpp)
+ add_test(testoctave testoctave)
+ ecm_mark_as_test(testoctave)
+ target_link_libraries( testoctave
+ Qt5::Test
+ cantorlibs
+ cantortest
+ )
endif(BUILD_TESTING)
=
install(FILES cantor_octave.knsrc DESTINATION ${KDE_INSTALL_CONFDIR} )
diff --git a/src/backends/python/CMakeLists.txt b/src/backends/python/CMake=
Lists.txt
index 1468bc3b..15822097 100644
--- a/src/backends/python/CMakeLists.txt
+++ b/src/backends/python/CMakeLists.txt
@@ -1,12 +1,12 @@
set( PythonBackend_SRCS
- pythonbackend.cpp
- pythonsession.cpp
- pythonexpression.cpp
- pythonkeywords.cpp
- pythonhighlighter.cpp
- pythoncompletionobject.cpp
- pythonextensions.cpp
- )
+ pythonbackend.cpp
+ pythonsession.cpp
+ pythonexpression.cpp
+ pythonkeywords.cpp
+ pythonhighlighter.cpp
+ pythoncompletionobject.cpp
+ pythonextensions.cpp
+)
=
qt5_add_resources(PythonBackend_RSCS python.qrc)
=
@@ -14,11 +14,12 @@ ki18n_wrap_ui(PythonBackend_SRCS settings.ui)
=
add_library(cantor_pythonbackend SHARED ${PythonBackend_SRCS} ${PythonBack=
end_RSCS})
target_link_libraries(cantor_pythonbackend
- cantorlibs
- KF5::KIOCore
- KF5::ConfigCore
- KF5::ConfigGui
- Qt5::DBus)
+ cantorlibs
+ KF5::KIOCore
+ KF5::ConfigCore
+ KF5::ConfigGui
+ Qt5::DBus
+)
=
install(TARGETS cantor_pythonbackend DESTINATION ${KDE_INSTALL_TARGETS_DEF=
AULT_ARGS})
#install(DIRECTORY . DESTINATION ${KDE_INSTALL_DATADIR}/cantor/pythonbacke=
nd FILES_MATCHING PATTERN "*.py")
diff --git a/src/backends/python2/CMakeLists.txt b/src/backends/python2/CMa=
keLists.txt
index 158830c9..bd5daa62 100644
--- a/src/backends/python2/CMakeLists.txt
+++ b/src/backends/python2/CMakeLists.txt
@@ -1,13 +1,13 @@
set( Python2Backend_SRCS
- python2backend.cpp
- python2session.cpp
+ python2backend.cpp
+ python2session.cpp
)
=
kconfig_add_kcfg_files(Python2Backend_SRCS settings.kcfgc)
=
if(MSVC)
- # ssize_t is typedef'd in both kdewin and python headers, this prevent=
s using the kdewin one
- add_definitions(-D_SSIZE_T_DEFINED)
+ # ssize_t is typedef'd in both kdewin and python headers, this prevents =
using the kdewin one
+ add_definitions(-D_SSIZE_T_DEFINED)
endif(MSVC)
=
include_directories(${PYTHON_LIBRARIES_DIR})
@@ -16,14 +16,13 @@ include_directories(${PYTHON_INCLUDE_DIR})
add_backend(python2backend ${Python2Backend_SRCS})
=
target_link_libraries(cantor_python2backend
- ${PYTHON_LIBRARIES}
- cantor_pythonbackend
- )
+ ${PYTHON_LIBRARIES}
+ cantor_pythonbackend
+)
=
if(BUILD_TESTING)
add_executable(testpython2 testpython2.cpp)
target_link_libraries(testpython2 ${QT_QTTEST_LIBRARY} cantorlibs cantor=
test)
-
add_test(NAME testpython2 COMMAND testpython2)
endif()
=
diff --git a/src/backends/python3/CMakeLists.txt b/src/backends/python3/CMa=
keLists.txt
index e72be87d..08019f20 100644
--- a/src/backends/python3/CMakeLists.txt
+++ b/src/backends/python3/CMakeLists.txt
@@ -1,6 +1,6 @@
-set( Python3Backend_SRCS
- python3backend.cpp
- python3session.cpp
+set(Python3Backend_SRCS
+ python3backend.cpp
+ python3session.cpp
)
=
kconfig_add_kcfg_files(Python3Backend_SRCS settings.kcfgc)
@@ -8,14 +8,20 @@ kconfig_add_kcfg_files(Python3Backend_SRCS settings.kcfgc)
add_backend(python3backend ${Python3Backend_SRCS})
=
target_link_libraries(cantor_python3backend
- cantor_pythonbackend
- Qt5::DBus)
-
-install(FILES cantor_python3.knsrc DESTINATION ${KDE_INSTALL_CONFDIR})
-install(FILES python3backend.kcfg DESTINATION ${KDE_INSTALL_KCFGDIR})
+ cantor_pythonbackend
+ Qt5::DBus)
=
add_subdirectory(python3server)
=
if(BUILD_TESTING)
- add_subdirectory(tests)
-endif()
+ add_executable(testpython3 testpython3.cpp)
+ add_test(NAME testpython3 COMMAND testpython3)
+ target_link_libraries(testpython3
+ Qt5::Test
+ cantorlibs
+ cantortest
+ )
+endif(BUILD_TESTING)
+
+install(FILES cantor_python3.knsrc DESTINATION ${KDE_INSTALL_CONFDIR})
+install(FILES python3backend.kcfg DESTINATION ${KDE_INSTALL_KCFGDIR})
\ No newline at end of file
diff --git a/src/backends/python3/tests/testpython3.cpp b/src/backends/pyth=
on3/testpython3.cpp
similarity index 100%
rename from src/backends/python3/tests/testpython3.cpp
rename to src/backends/python3/testpython3.cpp
diff --git a/src/backends/python3/tests/testpython3.h b/src/backends/python=
3/testpython3.h
similarity index 100%
rename from src/backends/python3/tests/testpython3.h
rename to src/backends/python3/testpython3.h
diff --git a/src/backends/python3/tests/CMakeLists.txt b/src/backends/pytho=
n3/tests/CMakeLists.txt
deleted file mode 100644
index 3c423f45..00000000
--- a/src/backends/python3/tests/CMakeLists.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-add_executable(testpython3 testpython3.cpp)
-target_link_libraries(testpython3 ${QT_QTTEST_LIBRARY} cantorlibs cantorte=
st)
-
-add_test(NAME testpython3 COMMAND testpython3)
diff --git a/src/backends/qalculate/CMakeLists.txt b/src/backends/qalculate=
/CMakeLists.txt
index 30d2367a..d388ed23 100644
--- a/src/backends/qalculate/CMakeLists.txt
+++ b/src/backends/qalculate/CMakeLists.txt
@@ -5,14 +5,14 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXC=
EPTIONS} -Wno-deprecate
add_definitions(${QALCULATE_CFLAGS})
=
set( QalculateBackend_SRCS
-qalculatesyntaxhelpobject.cpp
-qalculatebackend.cpp
-qalculatesession.cpp
-qalculatehighlighter.cpp
-qalculateexpression.cpp
-qalculateextensions.cpp
-qalculatecompletionobject.cpp
-qalculateextensions.cpp
+ qalculatesyntaxhelpobject.cpp
+ qalculatebackend.cpp
+ qalculatesession.cpp
+ qalculatehighlighter.cpp
+ qalculateexpression.cpp
+ qalculateextensions.cpp
+ qalculatecompletionobject.cpp
+ qalculateextensions.cpp
)
=
kconfig_add_kcfg_files(QalculateBackend_SRCS settings.kcfgc)
@@ -23,9 +23,9 @@ ki18n_wrap_ui(QalculateBackend_SRCS settings.ui)
add_backend(qalculatebackend ${QalculateBackend_SRCS})
=
if (QALCULATE_VERSION VERSION_LESS 2.0.0)
- target_link_libraries( cantor_qalculatebackend cantorlibs ${QALCULATE_=
LIBRARIES} ${CLN_LIBRARIES})
+ target_link_libraries( cantor_qalculatebackend cantorlibs ${QALCULATE_LI=
BRARIES} ${CLN_LIBRARIES})
else()
- target_link_libraries( cantor_qalculatebackend cantorlibs ${QALCULATE_=
LIBRARIES})
+ target_link_libraries( cantor_qalculatebackend cantorlibs ${QALCULATE_LI=
BRARIES})
endif()
=
install( FILES cantor_qalculate.knsrc DESTINATION ${KDE_INSTALL_CONFDIR}=
)
diff --git a/src/backends/sage/CMakeLists.txt b/src/backends/sage/CMakeList=
s.txt
index 647350d6..e5c89cc8 100644
--- a/src/backends/sage/CMakeLists.txt
+++ b/src/backends/sage/CMakeLists.txt
@@ -1,11 +1,11 @@
set( SageBackend_SRCS
- sagebackend.cpp
- sagesession.cpp
- sageexpression.cpp
- sageextensions.cpp
- sagekeywords.cpp
- sagehighlighter.cpp
- sagecompletionobject.cpp
+ sagebackend.cpp
+ sagesession.cpp
+ sageexpression.cpp
+ sageextensions.cpp
+ sagekeywords.cpp
+ sagehighlighter.cpp
+ sagecompletionobject.cpp
)
=
kconfig_add_kcfg_files(SageBackend_SRCS settings.kcfgc)
@@ -19,13 +19,12 @@ target_link_libraries( cantor_sagebackend KF5::Pty)
=
if(BUILD_TESTING)
add_executable( testsage testsage.cpp)
+ add_test(testsage testsage)
target_link_libraries( testsage
- ${QT_QTTEST_LIBRARY}
+ Qt5::Test
cantorlibs
cantortest
)
-
- add_test(NAME testsage COMMAND testsage)
endif()
=
install(FILES cantor_sage.knsrc DESTINATION ${KDE_INSTALL_CONFDIR})
diff --git a/src/backends/scilab/CMakeLists.txt b/src/backends/scilab/CMake=
Lists.txt
index 34000db4..f3ca1167 100644
--- a/src/backends/scilab/CMakeLists.txt
+++ b/src/backends/scilab/CMakeLists.txt
@@ -1,11 +1,11 @@
set( ScilabBackend_SRCS
- scilabbackend.cpp
- scilabsession.cpp
- scilabexpression.cpp
- scilabextensions.cpp
- scilabkeywords.cpp
- scilabhighlighter.cpp
- scilabcompletionobject.cpp
+ scilabbackend.cpp
+ scilabsession.cpp
+ scilabexpression.cpp
+ scilabextensions.cpp
+ scilabkeywords.cpp
+ scilabhighlighter.cpp
+ scilabcompletionobject.cpp
)
=
kconfig_add_kcfg_files(ScilabBackend_SRCS settings.kcfgc)
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic