[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    koffice/kexi/koproperty
From:       Jarosław Staniek <staniek () kde ! org>
Date:       2009-09-06 19:33:19
Message-ID: 1252265599.568716.11947.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1020624 by staniek:

koproperty2 -> koproperty


 M  +8 -8      CMakeLists.txt  
 M  +1 -1      koproperty_export.h  


--- trunk/koffice/kexi/koproperty/CMakeLists.txt #1020623:1020624
@@ -3,8 +3,8 @@
 add_definitions(-DKDE_DEFAULT_DEBUG_AREA=44022)
 
 include_directories(
-  ${CMAKE_SOURCE_DIR}/kexi/koproperty2
-  ${CMAKE_SOURCE_DIR}/kexi/koproperty2/koproperty/editors
+  ${CMAKE_SOURCE_DIR}/kexi/koproperty
+  ${CMAKE_SOURCE_DIR}/kexi/koproperty/editors
   ${CMAKE_SOURCE_DIR}/libs/odf
 #  ${CMAKE_SOURCE_DIR}/libs/guiutils
 #  ${KOMAIN_INCLUDES}
@@ -49,16 +49,16 @@
 )
 
 
-kde4_add_library(koproperty2 SHARED ${koproperty_LIB_SRCS})
+kde4_add_library(koproperty SHARED ${koproperty_LIB_SRCS})
 
-target_link_libraries(koproperty2
+target_link_libraries(koproperty
   
   ${KDE4_KDE3SUPPORT_LIBS}
   kobase
 )
 
-set_target_properties(koproperty2 PROPERTIES VERSION ${GENERIC_KOFFICE_LIB_VERSION} \
                SOVERSION ${GENERIC_KOFFICE_LIB_SOVERSION} )
-install(TARGETS koproperty2  ${INSTALL_TARGETS_DEFAULT_ARGS})
+set_target_properties(koproperty PROPERTIES VERSION ${GENERIC_KOFFICE_LIB_VERSION} \
SOVERSION ${GENERIC_KOFFICE_LIB_SOVERSION} ) +install(TARGETS koproperty  \
${INSTALL_TARGETS_DEFAULT_ARGS})  
 
 ########### install files ###############
@@ -73,7 +73,7 @@
   Utils.h
   Factory.h
   EditorView.h
-  DESTINATION ${INCLUDE_INSTALL_DIR}/koproperty2 COMPONENT Devel
+  DESTINATION ${INCLUDE_INSTALL_DIR}/koproperty COMPONENT Devel
 )
 
 install( FILES
@@ -99,4 +99,4 @@
 editors/symbolcombo.h
 editors/timeedit.h
 editors/urledit.h
-DESTINATION ${INCLUDE_INSTALL_DIR}/koproperty2/editors COMPONENT Devel)
+DESTINATION ${INCLUDE_INSTALL_DIR}/koproperty/editors COMPONENT Devel)
--- trunk/koffice/kexi/koproperty/koproperty_export.h #1020623:1020624
@@ -27,7 +27,7 @@
 #if defined _WIN32 || defined _WIN64
 
 #ifndef KOPROPERTY_EXPORT
-# if defined(MAKE_KOPROPERTY2_LIB)
+# if defined(MAKE_KOPROPERTY_LIB)
 /* We are building this library */
 #  define KOPROPERTY_EXPORT KDE_EXPORT
 # else


[prev in list] [next in list] [prev in thread] [next in thread]