[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdeedu/kalgebra
From: Aleix Pol Gonzalez <aleixpol () gmail ! com>
Date: 2008-01-30 21:05:21
Message-ID: 1201727121.013003.29087.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 768887 by apol:
- libanalitza is now a shared library.
- New source tree organisation
M +8 -0 CMakeLists.txt
A analitza (directory) src/analitza#765457
A analitza/CMakeLists.txt
A analitza/analitza.cpp src/analitza/analitza.cpp#768886 [License: GPL \
(v2+)] M +2 -4 analitza/analitzaexport.h
A analitza/expression.cpp src/analitza/expression.cpp#768886 [License: \
GPL (v2+)] A analitza/expression.h src/analitza/expression.h#768886 \
[License: GPL (v2+)] A analitza/operations.cpp \
src/analitza/operations.cpp#768886 [License: GPL (v2+)] A \
analitza/operations.h src/analitza/operations.h#768886 [License: GPL (v2+)] A \
analitza/operator.cpp src/analitza/operator.cpp#768886 [License: GPL (v2+)] A \
analitza/operator.h src/analitza/operator.h#768886 [License: GPL (v2+)] A \
calgebra (directory) src/calgebra#765457 M +2 -3 calgebra/CMakeLists.txt
A plasmoid (directory) src/plasmoid#766302
A plasmoid/CMakeLists.txt src/plasmoid/CMakeLists.txt#768886
A plasmoid/kalgebraplasma.cpp src/plasmoid/kalgebraplasma.cpp#768886 \
[License: GPL (v2+)] A plasmoid/kalgebraplasmoid.desktop \
src/plasmoid/kalgebraplasmoid.desktop#768886 M +6 -32 src/CMakeLists.txt
D src/analitza (directory)
D src/calgebra (directory)
D src/plasmoid (directory)
D src/tests (directory)
A tests (directory) src/tests#765457
M +2 -2 tests/CMakeLists.txt
A tests/analitzatest.cpp src/tests/analitzatest.cpp#768886 [License: \
GPL (v2+)]
--- trunk/KDE/kdeedu/kalgebra/CMakeLists.txt #768886:768887
@@ -17,6 +17,14 @@
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/config-kalgebra.h.cmake \
${CMAKE_CURRENT_BINARY_DIR}/src/config-kalgebra.h)
#adding subdirs
+add_subdirectory(analitza)
add_subdirectory(src)
+add_subdirectory(tests)
add_subdirectory(icons)
+if(HAVE_READLINE)
+ add_subdirectory(calgebra)
+endif(HAVE_READLINE)
+if(HAVE_PLASMA)
+ add_subdirectory(plasmoid)
+endif(HAVE_PLASMA)
\ No newline at end of file
--- trunk/KDE/kdeedu/kalgebra/analitza/analitzaexport.h #765457:768887
@@ -26,11 +26,9 @@
#include <kdemacros.h>
#ifndef ANALITZA_EXPORT
# ifdef MAKE_ANALITZA_LIB
-// # define ANALITZA_EXPORT KDE_EXPORT
-# define ANALITZA_EXPORT
+# define ANALITZA_EXPORT KDE_EXPORT
# else
-// # define ANALITZA_EXPORT KDE_IMPORT
-# define ANALITZA_EXPORT
+# define ANALITZA_EXPORT KDE_IMPORT
# endif
#endif
--- trunk/KDE/kdeedu/kalgebra/calgebra/CMakeLists.txt #765457:768887
@@ -1,12 +1,11 @@
-include_directories(${CMAKE_SOURCE_DIR}/kalgebra/src/analitza \
${READLINE_INCLUDE_DIR}) +include_directories(${CMAKE_SOURCE_DIR}/kalgebra/analitza \
${READLINE_INCLUDE_DIR})
set(calgebra_SRCS
main.cpp
)
kde4_add_executable(calgebra ${calgebra_SRCS})
-target_link_libraries(calgebra ${QT_QTCORE_LIBRARY} ${READLINE_LIBRARY}
-${NCURSES_LIBRARY} analitza)
+target_link_libraries(calgebra ${QT_QTCORE_LIBRARY} ${READLINE_LIBRARY} \
${NCURSES_LIBRARY} analitza)
install(TARGETS calgebra DESTINATION ${BIN_INSTALL_DIR})
--- trunk/KDE/kdeedu/kalgebra/src/CMakeLists.txt #768886:768887
@@ -1,25 +1,5 @@
-add_subdirectory(tests)
-if(HAVE_READLINE)
- add_subdirectory(calgebra)
-endif(HAVE_READLINE)
-if(HAVE_PLASMA)
- add_subdirectory(plasmoid)
-endif(HAVE_PLASMA)
+include_directories(../analitza)
-include_directories(analitza)
-
-set(analitza_SRCS
- analitza/expression.cpp
- analitza/analitza.cpp
- analitza/container.cpp
- analitza/operator.cpp
- analitza/operations.cpp
- analitza/exp.cpp
- analitza/variables.cpp
- analitza/object.cpp
- analitza/value.cpp
-)
-
set(kalgebra_SRCS
algebrahighlighter.cpp
kalgebra.cpp
@@ -40,22 +20,16 @@
functionsmodel.cpp
)
-kde4_add_library(analitza ${analitza_SRCS})
-target_link_libraries(analitza ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY} \
${KDE4_KDECORE_LIBS})
-
-#uncomment this if oxygen icons for kalgebra are available
-#kde4_add_app_icon(kalgebra_SRCS \
"${CMAKE_INSTALL_PREFIX}/share/icons/oxygen/*/apps/kalgebra.png")
-kde4_add_app_icon(kalgebra_SRCS \
"${CMAKE_CURRENT_SOURCE_DIR}/../icons/hi*-app-kalgebra.png")
-
kde4_add_executable(kalgebra ${kalgebra_SRCS})
+target_link_libraries(kalgebra ${KDE4_KHTML_LIBS} analitza)
-target_link_libraries(kalgebra ${KDE4_KHTML_LIBS} analitza)
-
if(OPENGL_FOUND)
- target_link_libraries(kalgebra ${QT_QTOPENGL_LIBRARY} ${OPENGL_gl_LIBRARY} \
${OPENGL_glu_LIBRARY}) + target_link_libraries(kalgebra ${QT_QTOPENGL_LIBRARY} \
${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}) endif(OPENGL_FOUND)
install(TARGETS kalgebra DESTINATION ${BIN_INSTALL_DIR})
-#install(TARGETS analitza DESTINATION ${LIB_INSTALL_DIR})
install(FILES kalgebra.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
+#uncomment this if oxygen icons for kalgebra are available
+#kde4_add_app_icon(kalgebra_SRCS \
"${CMAKE_INSTALL_PREFIX}/share/icons/oxygen/*/apps/kalgebra.png") \
+kde4_add_app_icon(kalgebra_SRCS \
"${CMAKE_CURRENT_SOURCE_DIR}/../icons/hi*-app-kalgebra.png")
--- trunk/KDE/kdeedu/kalgebra/tests/CMakeLists.txt #765457:768887
@@ -1,6 +1,6 @@
set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
-include_directories(${CMAKE_SOURCE_DIR}/kalgebra/src/ \
${CMAKE_SOURCE_DIR}/kalgebra/src/analitza) \
+include_directories(${CMAKE_SOURCE_DIR}/kalgebra/src \
${CMAKE_SOURCE_DIR}/kalgebra/analitza)
set( analitzatest_SRCS analitzatest.cpp)
kde4_add_unit_test(analitzatest ${analitzatest_SRCS})
@@ -10,7 +10,7 @@
kde4_add_unit_test(expressiontest ${expressiontest_SRCS})
target_link_libraries(expressiontest ${QT_QTXML_LIBRARY} ${QT_QTTEST_LIBRARY} \
analitza)
-set( functiontest_SRCS functiontest.cpp ../function.cpp ../functionimpl.cpp)
+set( functiontest_SRCS functiontest.cpp ../src/function.cpp ../src/functionimpl.cpp)
kde4_add_unit_test(functiontest ${functiontest_SRCS})
target_link_libraries(functiontest ${QT_QTXML_LIBRARY} ${QT_QTTEST_LIBRARY} \
${QT_QTGUI_LIBRARY} analitza)
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic