[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdeutils/khexedit
From: Friedrich W. H. Kossebau <kossebau () kde ! org>
Date: 2007-05-30 15:02:56
Message-ID: 1180537376.780023.30407.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 669834 by kossebau:
rename khexedit2* libs to okteta*
M +8 -9 core/CMakeLists.txt
M +20 -26 core/tests/CMakeLists.txt
M +10 -12 gui/CMakeLists.txt
M +4 -9 gui/test/CMakeLists.txt
M +1 -1 parts/kbytesedit/CMakeLists.txt
M +1 -1 parts/kpart/CMakeLists.txt
--- trunk/KDE/kdeutils/khexedit/core/CMakeLists.txt #669833:669834
@@ -1,5 +1,3 @@
-add_subdirectory( tests )
-
set( libcontroller_SRCS
controller/kchareditor.cpp
controller/kcontroller.cpp
@@ -20,7 +18,7 @@
codecs/ktextcharcodec.cpp
)
-set( khexeditcore_LIB_SRCS
+set( oktetacore_LIB_SRCS
${libcodecs_SRCS}
kabstractbytearraymodel.cpp
kbytearraymodel_p.cpp
@@ -32,16 +30,17 @@
ksection.cpp
ksectionlist.cpp)
-kde4_automoc(${khexeditcore_LIB_SRCS})
+kde4_automoc(${oktetacore_LIB_SRCS})
-kde4_add_library( khexeditcore SHARED ${khexeditcore_LIB_SRCS} )
-target_link_libraries( khexeditcore ${KDE4_KDECORE_LIBS} )
-set_target_properties( khexeditcore PROPERTIES VERSION 1.0.0 SOVERSION 1 )
+kde4_add_library( oktetacore SHARED ${oktetacore_LIB_SRCS} )
+target_link_libraries( oktetacore ${KDE4_KDECORE_LIBS} )
+set_target_properties( oktetacore PROPERTIES VERSION 1.0.0 SOVERSION 1 )
-install(TARGETS khexeditcore DESTINATION ${LIB_INSTALL_DIR})
+install( TARGETS oktetacore DESTINATION ${LIB_INSTALL_DIR})
if(KDE4_BUILD_TESTS)
- kde4_add_library( testkhexeditcore STATIC ${khexeditcore_LIB_SRCS} )
+ add_subdirectory( tests )
+ kde4_add_library( testoktetacore STATIC ${oktetacore_LIB_SRCS} )
endif(KDE4_BUILD_TESTS)
--- trunk/KDE/kdeutils/khexedit/core/tests/CMakeLists.txt #669833:669834
@@ -1,5 +1,3 @@
-if(KDE4_BUILD_TESTS)
-
set(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
set(SUTDIR ${CMAKE_CURRENT_SOURCE_DIR}/..)
@@ -18,7 +16,7 @@
target_link_libraries(ksectiontest ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY})
-add_test(khexedit-ksectiontest ${EXECUTABLE_OUTPUT_PATH}/ksectiontest)
+add_test(okteta-ksectiontest ${EXECUTABLE_OUTPUT_PATH}/ksectiontest)
########### next target ###############
@@ -29,9 +27,9 @@
kde4_add_executable(ksectionlisttest RUN_UNINSTALLED ${ksectionlisttest_SRCS})
-target_link_libraries(ksectionlisttest testkhexeditcore ${KDE4_KDECORE_LIBS} \
${QT_QTTEST_LIBRARY}) +target_link_libraries(ksectionlisttest testoktetacore \
${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY})
-add_test(khexedit-ksectionlisttest ${EXECUTABLE_OUTPUT_PATH}/ksectionlisttest)
+add_test(okteta-ksectionlisttest ${EXECUTABLE_OUTPUT_PATH}/ksectionlisttest)
########### next target ###############
@@ -45,7 +43,7 @@
target_link_libraries(kselectiontest ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY})
-add_test(khexedit-kselectiontest ${EXECUTABLE_OUTPUT_PATH}/kselectiontest)
+add_test(okteta-kselectiontest ${EXECUTABLE_OUTPUT_PATH}/kselectiontest)
########### next target ###############
@@ -57,9 +55,9 @@
kde4_add_executable(kfixedsizebytearraymodeltest RUN_UNINSTALLED \
${kfixedsizebytearraymodeltest_SRCS})
target_link_libraries(kfixedsizebytearraymodeltest
- testkhexeditcore ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY})
+ testoktetacore ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY})
-add_test(khexedit-kfixedsizebytearraymodeltest \
${EXECUTABLE_OUTPUT_PATH}/kfixedsizebytearraymodeltest) \
+add_test(okteta-kfixedsizebytearraymodeltest \
${EXECUTABLE_OUTPUT_PATH}/kfixedsizebytearraymodeltest)
########### next target ###############
@@ -72,9 +70,9 @@
kde4_add_executable(kfixedsizebytearraymodelkabstractbytearraymodeliftest \
RUN_UNINSTALLED ${kfixedsizebytearraymodelkabstractbytearraymodeliftest_SRCS})
target_link_libraries(kfixedsizebytearraymodelkabstractbytearraymodeliftest
- testkhexeditcore ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY})
+ testoktetacore ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY})
-add_test(khexedit-kfixedsizebytearraymodelkabstractbytearraymodeliftest \
${EXECUTABLE_OUTPUT_PATH}/kfixedsizebytearraymodelkabstractbytearraymodeliftest) \
+add_test(okteta-kfixedsizebytearraymodelkabstractbytearraymodeliftest \
${EXECUTABLE_OUTPUT_PATH}/kfixedsizebytearraymodelkabstractbytearraymodeliftest)
########### next target ###############
@@ -86,9 +84,9 @@
kde4_add_executable(kbytearraymodeltest RUN_UNINSTALLED ${kbytearraymodeltest_SRCS})
target_link_libraries(kbytearraymodeltest
- testkhexeditcore ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY})
+ testoktetacore ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY})
-add_test(khexedit-kbytearraymodeltest ${EXECUTABLE_OUTPUT_PATH}/kbytearraymodeltest)
+add_test(okteta-kbytearraymodeltest ${EXECUTABLE_OUTPUT_PATH}/kbytearraymodeltest)
########### next target ###############
@@ -101,9 +99,9 @@
kde4_add_executable(kbytearraymodelkabstractbytearraymodeliftest RUN_UNINSTALLED \
${kbytearraymodelkabstractbytearraymodeliftest_SRCS})
target_link_libraries(kbytearraymodelkabstractbytearraymodeliftest
- testkhexeditcore ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY})
+ testoktetacore ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY})
-add_test(khexedit-kbytearraymodelkabstractbytearraymodeliftest \
${EXECUTABLE_OUTPUT_PATH}/kbytearraymodelkabstractbytearraymodeliftest) \
+add_test(okteta-kbytearraymodelkabstractbytearraymodeliftest \
${EXECUTABLE_OUTPUT_PATH}/kbytearraymodelkabstractbytearraymodeliftest)
########### next target ###############
@@ -115,9 +113,9 @@
kde4_add_executable(kcharcodectest RUN_UNINSTALLED ${kcharcodectest_SRCS})
target_link_libraries(kcharcodectest
- testkhexeditcore ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY})
+ testoktetacore ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY})
-add_test(khexedit-kcharcodectest ${EXECUTABLE_OUTPUT_PATH}/kcharcodectest)
+add_test(okteta-kcharcodectest ${EXECUTABLE_OUTPUT_PATH}/kcharcodectest)
########### next target ###############
@@ -129,9 +127,9 @@
kde4_add_executable(ktextcharcodectest RUN_UNINSTALLED ${ktextcharcodectest_SRCS})
target_link_libraries(ktextcharcodectest
- testkhexeditcore ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY})
+ testoktetacore ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY})
-add_test(khexedit-ktextcharcodectest ${EXECUTABLE_OUTPUT_PATH}/ktextcharcodectest)
+add_test(okteta-ktextcharcodectest ${EXECUTABLE_OUTPUT_PATH}/ktextcharcodectest)
########### next target ###############
@@ -144,9 +142,9 @@
kde4_add_executable(ktextcharcodeckcharcodeciftest RUN_UNINSTALLED \
${ktextcharcodeckcharcodeciftest_SRCS})
target_link_libraries(ktextcharcodeckcharcodeciftest
- testkhexeditcore ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY})
+ testoktetacore ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY})
-add_test(khexedit-ktextcharcodeckcharcodeciftest \
${EXECUTABLE_OUTPUT_PATH}/ktextcharcodeckcharcodeciftest) \
+add_test(okteta-ktextcharcodeckcharcodeciftest \
${EXECUTABLE_OUTPUT_PATH}/ktextcharcodeckcharcodeciftest)
########### next target ###############
@@ -159,10 +157,6 @@
kde4_add_executable(kebcdic1047charcodeckcharcodeciftest RUN_UNINSTALLED \
${kebcdic1047charcodeckcharcodeciftest_SRCS})
target_link_libraries(kebcdic1047charcodeckcharcodeciftest
- testkhexeditcore ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY})
+ testoktetacore ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY})
-add_test(khexedit-kebcdic1047charcodeckcharcodeciftest \
${EXECUTABLE_OUTPUT_PATH}/kebcdic1047charcodeckcharcodeciftest)
-
-
-endif(KDE4_BUILD_TESTS)
-
+add_test(okteta-kebcdic1047charcodeckcharcodeciftest \
${EXECUTABLE_OUTPUT_PATH}/kebcdic1047charcodeckcharcodeciftest)
--- trunk/KDE/kdeutils/khexedit/gui/CMakeLists.txt #669833:669834
@@ -1,5 +1,3 @@
-add_subdirectory( test )
-
include_directories(
${CMAKE_SOURCE_DIR}/khexedit/core
${CMAKE_SOURCE_DIR}/khexedit/gui/libkcolumnsview
@@ -19,7 +17,7 @@
libkcolumnsview/kcolumnsview.cpp
)
-set( khexeditgui_LIB_SRCS
+set( oktetagui_LIB_SRCS
${libkcolumnsview_SRCS}
${libcontroller_SRCS}
kbordercolumn.cpp
@@ -41,16 +39,16 @@
kvaluecoltextexport.cpp
kcharcoltextexport.cpp )
-kde4_automoc(${khexeditgui_LIB_SRCS})
+kde4_automoc( ${oktetagui_LIB_SRCS} )
-kde4_add_library( khexeditgui SHARED ${khexeditgui_LIB_SRCS} )
-target_link_libraries( khexeditgui khexeditcore ${KDE4_KDEUI_LIBS} )
-set_target_properties( khexeditgui PROPERTIES VERSION 1.0.0 SOVERSION 1 )
+kde4_add_library( oktetagui SHARED ${oktetagui_LIB_SRCS} )
+target_link_libraries( oktetagui oktetacore ${KDE4_KDEUI_LIBS} )
+set_target_properties( oktetagui PROPERTIES VERSION 1.0.0 SOVERSION 1 )
+install( TARGETS oktetagui DESTINATION ${LIB_INSTALL_DIR} )
-install(TARGETS khexeditgui DESTINATION ${LIB_INSTALL_DIR})
+if(KDE4_BUILD_TESTS)
+add_subdirectory( test )
+# kde4_add_library( testoktetacore STATIC ${oktetagui_LIB_SRCS} )
+endif(KDE4_BUILD_TESTS)
-#if(KDE4_BUILD_TESTS)
-# kde4_add_library( testkhexeditcommon STATIC ${khexeditgui_LIB_SRCS} )
-#endif(KDE4_BUILD_TESTS)
-
--- trunk/KDE/kdeutils/khexedit/gui/test/CMakeLists.txt #669833:669834
@@ -1,5 +1,3 @@
-if(KDE4_BUILD_TESTS)
-
set(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
set(SUTDIR ${CMAKE_CURRENT_SOURCE_DIR}/..)
@@ -21,7 +19,7 @@
target_link_libraries(kcoordtest ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY})
-add_test(khexedit-kcoordtest ${EXECUTABLE_OUTPUT_PATH}/kcoordtest)
+add_test(okteta-kcoordtest ${EXECUTABLE_OUTPUT_PATH}/kcoordtest)
########### next target ###############
@@ -34,7 +32,7 @@
target_link_libraries(kcoordrangetest ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY})
-add_test(khexedit-kcoordrangetest ${EXECUTABLE_OUTPUT_PATH}/kcoordrangetest)
+add_test(okteta-kcoordrangetest ${EXECUTABLE_OUTPUT_PATH}/kcoordrangetest)
########### next target ###############
@@ -50,7 +48,7 @@
target_link_libraries(kcoordrangelisttest ${KDE4_KDECORE_LIBS} \
${QT_QTTEST_LIBRARY})
-add_test(khexedit-kcoordrangelisttest ${EXECUTABLE_OUTPUT_PATH}/kcoordrangelisttest)
+add_test(okteta-kcoordrangelisttest ${EXECUTABLE_OUTPUT_PATH}/kcoordrangelisttest)
########### next target ###############
@@ -61,9 +59,6 @@
#kde4_add_executable( mvctest RUN_UNINSTALLED ${mvctest_SRCS} )
-# target_link_libraries( mvctest khexeditcore khexeditgui ${KDE4_KDEUI_LIBS} )
+# target_link_libraries( mvctest oktetacore oktetagui ${KDE4_KDEUI_LIBS} )
########### install files ###############
-
-endif(KDE4_BUILD_TESTS)
-
--- trunk/KDE/kdeutils/khexedit/parts/kbytesedit/CMakeLists.txt #669833:669834
@@ -15,7 +15,7 @@
kde4_add_plugin( kbytearrayedit WITH_PREFIX ${kbytearrayedit_PART_SRCS} )
-target_link_libraries(kbytearrayedit khexeditcore khexeditgui ${KDE4_KPARTS_LIBS} )
+target_link_libraries(kbytearrayedit oktetacore oktetagui ${KDE4_KPARTS_LIBS} )
install( TARGETS kbytearrayedit DESTINATION ${PLUGIN_INSTALL_DIR} )
install( FILES kbytearrayedit.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
--- trunk/KDE/kdeutils/khexedit/parts/kpart/CMakeLists.txt #669833:669834
@@ -13,7 +13,7 @@
kde4_add_plugin( oktetapart WITH_PREFIX ${oktetapart_SRCS})
-target_link_libraries( oktetapart khexeditcore khexeditgui ${KDE4_KPARTS_LIBS} )
+target_link_libraries( oktetapart oktetacore oktetagui ${KDE4_KPARTS_LIBS} )
install( TARGETS oktetapart DESTINATION ${PLUGIN_INSTALL_DIR})
install( FILES oktetapart.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic