2 commits - CMakeLists.txt schemas/ical schemas/kolabformat-xcard.xsd schemas/kolabformat.xsd

[Jeroen van Meeuwen]

 CMakeLists.txt                    |    2 +-
 schemas/ical/kolabformat-xcal.xsd |    4 ++--
 schemas/kolabformat-xcard.xsd     |    4 ++--
 schemas/kolabformat.xsd           |    4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 6606618f20a6189bfff15d04f61321d68ff39fc9
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Tue Aug 26 12:50:51 2014 +0200

    Drop dev1 suffix for format version number

diff --git a/schemas/ical/kolabformat-xcal.xsd b/schemas/ical/kolabformat-xcal.xsd
index 0fe7310..c07490b 100644
--- a/schemas/ical/kolabformat-xcal.xsd
+++ b/schemas/ical/kolabformat-xcal.xsd
@@ -41,7 +41,7 @@
         <xs:complexContent mixed="false">
             <xs:extension base="BasePropertyType">
                 <xs:sequence>
-                    <xs:element name="text" type="xs:string" default="3.0dev1"/>
+                    <xs:element name="text" type="xs:string" default="3.0"/>
                 </xs:sequence>
             </xs:extension>
         </xs:complexContent>
@@ -250,4 +250,4 @@
     
     
     
-</xs:schema>
\ No newline at end of file
+</xs:schema>
diff --git a/schemas/kolabformat-xcard.xsd b/schemas/kolabformat-xcard.xsd
index 6a422b8..150879d 100644
--- a/schemas/kolabformat-xcard.xsd
+++ b/schemas/kolabformat-xcard.xsd
@@ -10,7 +10,7 @@
         <xs:complexContent mixed="false">
             <xs:extension base="BasePropertyType">
                 <xs:sequence>
-                    <xs:element name="text" type="xs:string" default="3.0dev1"/>
+                    <xs:element name="text" type="xs:string" default="3.0"/>
                 </xs:sequence>
             </xs:extension>
         </xs:complexContent>
@@ -123,4 +123,4 @@
     
     <xs:element name="vcards" type="VcardsType"/>
     
-</xs:schema>
\ No newline at end of file
+</xs:schema>
diff --git a/schemas/kolabformat.xsd b/schemas/kolabformat.xsd
index 508e9c3..9604b2e 100644
--- a/schemas/kolabformat.xsd
+++ b/schemas/kolabformat.xsd
@@ -7,7 +7,7 @@
 
     
     <xs:complexType name="KolabBase">
-        <xs:attribute name="version" type="xs:string" fixed="3.0dev1" />
+        <xs:attribute name="version" type="xs:string" fixed="3.0" />
     </xs:complexType>
 
 
@@ -173,4 +173,4 @@
   <xs:element name="configuration" type="Configuration"/>
 
 
-</xs:schema>
\ No newline at end of file
+</xs:schema>


commit 21d95fe86aabd18a0dd8b50c474ea6ec25ae1642
Author: Daniel Vrátil <dvratil at redhat.com>
Date:   Tue Aug 26 12:42:40 2014 +0200

    Resolve #2722:
    
    libkolabxml ignores LIB_SUFFIX CMake variable. It is usually defined to 64bit systems to "64" to force installing libraries to lib64.
    
    This means that self-compiled libkolab is always installed into ${CMAKE_INSTALL_PREFIX}/lib, even on 64bit system that uses ${CMAKE_INSTALL_PREFIX}/lib64.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c348f6f..62c13eb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -75,7 +75,7 @@ endif()
 #C++ is required from here on
 enable_language(CXX)
 
-set(LIB_INSTALL_DIR lib CACHE STRING "The directories where to install libraries to")
+set(LIB_INSTALL_DIR lib${LIB_SUFFIX} CACHE STRING "The directories where to install libraries to")
 set(INCLUDE_INSTALL_DIR include CACHE STRING "The directory where to install headers to")
 set(INCLUDE_INSTALL_DIR ${INCLUDE_INSTALL_DIR}/kolabxml)
 set(CMAKECONFIG_INSTALL_DIR ${LIB_INSTALL_DIR}/cmake/Libkolabxml )