diff options
author | Nikias Bassen | 2013-03-18 15:02:11 +0100 |
---|---|---|
committer | Nikias Bassen | 2013-03-18 15:02:11 +0100 |
commit | 1eb804e3a2a7e39771deb4b50f38e21d500f9423 (patch) | |
tree | d2c021fc224f9ce9795445cbeedf4b912609bf28 | |
parent | b069971dcac68c46923eff19526f64115d2e4222 (diff) | |
download | libplist-1eb804e3a2a7e39771deb4b50f38e21d500f9423.tar.gz libplist-1eb804e3a2a7e39771deb4b50f38e21d500f9423.tar.bz2 |
renamed plutil to plistutil to not mask Apple's plutil on OSX
-rw-r--r-- | CMakeLists.txt | 4 | ||||
-rw-r--r-- | cmake/libplistPackaging.cmake | 4 | ||||
-rw-r--r-- | plistutil/CMakeLists.txt | 9 | ||||
-rw-r--r-- | plistutil/plistutil.c (renamed from plutil/plutil.c) | 4 | ||||
-rw-r--r-- | plistutil/plistutil.h (renamed from plutil/plutil.h) | 2 | ||||
-rw-r--r-- | plutil/CMakeLists.txt | 9 |
6 files changed, 16 insertions, 16 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 494c74d..5c95fea 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,7 +5,7 @@ SET( LIBPLIST_VERSION_MINOR "9" ) SET( LIBPLIST_SOVERSION "1" ) SET( LIBPLIST_VERSION "${LIBPLIST_VERSION_MAJOR}.${LIBPLIST_VERSION_MINOR}" ) SET( LIBPLIST_LIBVERSION "${LIBPLIST_SOVERSION}.${LIBPLIST_VERSION}" ) -SET( PLUTIL_VERSION ${LIBPLIST_VERSION} ) +SET( PLISTUTIL_VERSION ${LIBPLIST_VERSION} ) SET( CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake ${CMAKE_SOURCE_DIR}/cmake/modules ) @@ -53,7 +53,7 @@ SET ( PLIST_BYTE_ORDER ${endianess} ) ADD_SUBDIRECTORY( libcnary ) ADD_SUBDIRECTORY( src ) -ADD_SUBDIRECTORY( plutil ) +ADD_SUBDIRECTORY( plistutil ) ADD_SUBDIRECTORY( include ) ADD_SUBDIRECTORY( test ) diff --git a/cmake/libplistPackaging.cmake b/cmake/libplistPackaging.cmake index 1a5fd92..fbd865f 100644 --- a/cmake/libplistPackaging.cmake +++ b/cmake/libplistPackaging.cmake @@ -7,9 +7,9 @@ MACRO( LIBPLIST_PACKAGE _major _minor) SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING.LESSER") SET(CPACK_COMPONENT_LIB_DISPLAY_NAME "PList library") SET(CPACK_COMPONENT_DEV_DISPLAY_NAME "PList development files") - SET(CPACK_COMPONENT_PLUTIL_DISPLAY_NAME "PList conversion tool") + SET(CPACK_COMPONENT_PLISTUTIL_DISPLAY_NAME "PList conversion tool") set(CPACK_COMPONENT_DEV_DEPENDS lib) - set(CPACK_COMPONENT_PLUTIL_DEPENDS lib) + set(CPACK_COMPONENT_PLISTUTIL_DEPENDS lib) INCLUDE( CPack ) ENDMACRO( LIBPLIST_PACKAGE ) diff --git a/plistutil/CMakeLists.txt b/plistutil/CMakeLists.txt new file mode 100644 index 0000000..68382ee --- /dev/null +++ b/plistutil/CMakeLists.txt @@ -0,0 +1,9 @@ + +SET(plistutil_SRC + plistutil.c) + +ADD_EXECUTABLE(plistutil ${plistutil_SRC}) +TARGET_LINK_LIBRARIES(plistutil plist) +SET_TARGET_PROPERTIES( plistutil PROPERTIES VERSION ${PLISTUTIL_VERSION} ) + +INSTALL( TARGETS plistutil RUNTIME DESTINATION bin COMPONENT plistutil ) diff --git a/plutil/plutil.c b/plistutil/plistutil.c index 88df080..3e09bb2 100644 --- a/plutil/plutil.c +++ b/plistutil/plistutil.c @@ -1,5 +1,5 @@ /* - * plutil.C + * plistutil.c * source for plist convertion tool * * Copyright (c) 2008 Zach C. All Rights Reserved. @@ -21,7 +21,7 @@ #include "plist/plist.h" -#include "plutil.h" +#include "plistutil.h" #include <stdio.h> #include <stdlib.h> diff --git a/plutil/plutil.h b/plistutil/plistutil.h index 4be716e..40421a3 100644 --- a/plutil/plutil.h +++ b/plistutil/plistutil.h @@ -1,5 +1,5 @@ /* - * plutil.h + * plistutil.h * header for plist convertion tool * * Copyright (c) 2008 Zach C. All Rights Reserved. diff --git a/plutil/CMakeLists.txt b/plutil/CMakeLists.txt deleted file mode 100644 index 149d68f..0000000 --- a/plutil/CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ - -SET(plutil_SRC - plutil.c) - -ADD_EXECUTABLE(plutil ${plutil_SRC}) -TARGET_LINK_LIBRARIES(plutil plist) -SET_TARGET_PROPERTIES( plutil PROPERTIES VERSION ${PLUTIL_VERSION} ) - -INSTALL( TARGETS plutil RUNTIME DESTINATION bin COMPONENT plutil )
\ No newline at end of file |