diff options
| author | 2011-09-26 15:09:09 +0200 | |
|---|---|---|
| committer | 2011-09-26 15:09:09 +0200 | |
| commit | da1c7787659973b2ace32731f0eb7d1bfeecd340 (patch) | |
| tree | 3cb844b4c1578c526893cd8b5caf24422d944725 | |
| parent | 13ecca44eefd367354070a22dec7c0829e1ba6fd (diff) | |
| download | libplist-da1c7787659973b2ace32731f0eb7d1bfeecd340.tar.gz libplist-da1c7787659973b2ace32731f0eb7d1bfeecd340.tar.bz2 | |
move cmake endianess detection to proper place and actually USE it
| -rw-r--r-- | CMakeLists.txt | 8 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 1 |
2 files changed, 5 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index a13546e..342ff91 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
| @@ -39,6 +39,10 @@ To do so, perform the following steps in the base directory: | |||
| 39 | Then, run cmake again.") | 39 | Then, run cmake again.") |
| 40 | ENDIF() | 40 | ENDIF() |
| 41 | 41 | ||
| 42 | INCLUDE (TestBigEndian) | ||
| 43 | TEST_BIG_ENDIAN(endianess) | ||
| 44 | SET ( PLIST_BYTE_ORDER ${endianess} ) | ||
| 45 | |||
| 42 | ADD_SUBDIRECTORY( libcnary ) | 46 | ADD_SUBDIRECTORY( libcnary ) |
| 43 | ADD_SUBDIRECTORY( src ) | 47 | ADD_SUBDIRECTORY( src ) |
| 44 | ADD_SUBDIRECTORY( plutil ) | 48 | ADD_SUBDIRECTORY( plutil ) |
| @@ -49,10 +53,6 @@ IF ( SWIG_FOUND AND PYTHONLIBS_FOUND AND PYTHONINTERP_FOUND ) | |||
| 49 | ADD_SUBDIRECTORY( swig ) | 53 | ADD_SUBDIRECTORY( swig ) |
| 50 | ENDIF ( SWIG_FOUND AND PYTHONLIBS_FOUND AND PYTHONINTERP_FOUND ) | 54 | ENDIF ( SWIG_FOUND AND PYTHONLIBS_FOUND AND PYTHONINTERP_FOUND ) |
| 51 | 55 | ||
| 52 | INCLUDE (TestBigEndian) | ||
| 53 | TEST_BIG_ENDIAN(endianess) | ||
| 54 | SET ( PLIST_BYTE_ORDER ${endianess} ) | ||
| 55 | |||
| 56 | # add uninstall target | 56 | # add uninstall target |
| 57 | CONFIGURE_FILE( "${CMAKE_SOURCE_DIR}/cmake/modules/cmake_uninstall.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" IMMEDIATE @ONLY) | 57 | CONFIGURE_FILE( "${CMAKE_SOURCE_DIR}/cmake/modules/cmake_uninstall.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" IMMEDIATE @ONLY) |
| 58 | ADD_CUSTOM_TARGET(uninstall "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake") | 58 | ADD_CUSTOM_TARGET(uninstall "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake") |
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a0d6179..0de4c8c 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt | |||
| @@ -34,6 +34,7 @@ SET(libcnary_object_files | |||
| 34 | 34 | ||
| 35 | SET_SOURCE_FILES_PROPERTIES(${libcnary_object_files} PROPERTIES EXTERNAL_OBJECT true GENERATED true) | 35 | SET_SOURCE_FILES_PROPERTIES(${libcnary_object_files} PROPERTIES EXTERNAL_OBJECT true GENERATED true) |
| 36 | 36 | ||
| 37 | SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DPLIST_BYTE_ORDER=${PLIST_BYTE_ORDER}") | ||
| 37 | ADD_LIBRARY( plist SHARED ${libplist_SRC} ${libcnary_object_files} ) | 38 | ADD_LIBRARY( plist SHARED ${libplist_SRC} ${libcnary_object_files} ) |
| 38 | TARGET_LINK_LIBRARIES( plist ${LIBXML2_LIBRARIES} ) | 39 | TARGET_LINK_LIBRARIES( plist ${LIBXML2_LIBRARIES} ) |
| 39 | SET_TARGET_PROPERTIES( plist PROPERTIES VERSION ${LIBPLIST_LIBVERSION} ) | 40 | SET_TARGET_PROPERTIES( plist PROPERTIES VERSION ${LIBPLIST_LIBVERSION} ) |
