Merge branch 'master' into chronic

CMakeLists.txt

@@ -1,7 +1,7 @@
 PROJECT( libplist )
 
 SET( LIBPLIST_VERSION_MAJOR "1" )
-SET( LIBPLIST_VERSION_MINOR "6" )
+SET( LIBPLIST_VERSION_MINOR "7" )
 SET( LIBPLIST_SOVERSION "1" )
 SET( LIBPLIST_VERSION "${LIBPLIST_VERSION_MAJOR}.${LIBPLIST_VERSION_MINOR}" )
 SET( LIBPLIST_LIBVERSION "${LIBPLIST_SOVERSION}.${LIBPLIST_VERSION}" )
@@ -39,6 +39,10 @@ To do so, perform the following steps in the base directory:
 Then, run cmake again.")
 ENDIF()
 
+INCLUDE (TestBigEndian)
+TEST_BIG_ENDIAN(endianess)
+SET ( PLIST_BYTE_ORDER ${endianess} )
+
 ADD_SUBDIRECTORY( libcnary )
 ADD_SUBDIRECTORY( src )
 ADD_SUBDIRECTORY( plutil )
@@ -49,10 +53,6 @@ IF ( SWIG_FOUND AND PYTHONLIBS_FOUND AND PYTHONINTERP_FOUND )
 	ADD_SUBDIRECTORY( swig )
 ENDIF ( SWIG_FOUND AND PYTHONLIBS_FOUND AND PYTHONINTERP_FOUND )
 
-INCLUDE (TestBigEndian)
-TEST_BIG_ENDIAN(endianess)
-SET ( PLIST_BYTE_ORDER ${endianess} )
-
 # add uninstall target
 CONFIGURE_FILE(	"${CMAKE_SOURCE_DIR}/cmake/modules/cmake_uninstall.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" IMMEDIATE @ONLY)
 ADD_CUSTOM_TARGET(uninstall "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")

NEWS

@@ -1,3 +1,9 @@
+Version 1.7
+~~~~~~~~~~~
+
+- Changes:
+  * Fix building on Big Endian systems
+
 Version 1.6
 ~~~~~~~~~~~
 

src/CMakeLists.txt

@@ -34,6 +34,7 @@ SET(libcnary_object_files
 
 SET_SOURCE_FILES_PROPERTIES(${libcnary_object_files} PROPERTIES EXTERNAL_OBJECT true GENERATED true)
 
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DPLIST_BYTE_ORDER=${PLIST_BYTE_ORDER}")
 ADD_LIBRARY( plist SHARED ${libplist_SRC} ${libcnary_object_files} )
 TARGET_LINK_LIBRARIES( plist ${LIBXML2_LIBRARIES} )
 SET_TARGET_PROPERTIES( plist PROPERTIES VERSION ${LIBPLIST_LIBVERSION} )