Commit 1eb804e3 authored by Nikias Bassen's avatar Nikias Bassen

renamed plutil to plistutil to not mask Apple's plutil on OSX

parent b069971d
...@@ -5,7 +5,7 @@ SET( LIBPLIST_VERSION_MINOR "9" ) ...@@ -5,7 +5,7 @@ SET( LIBPLIST_VERSION_MINOR "9" )
SET( LIBPLIST_SOVERSION "1" ) SET( LIBPLIST_SOVERSION "1" )
SET( LIBPLIST_VERSION "${LIBPLIST_VERSION_MAJOR}.${LIBPLIST_VERSION_MINOR}" ) SET( LIBPLIST_VERSION "${LIBPLIST_VERSION_MAJOR}.${LIBPLIST_VERSION_MINOR}" )
SET( LIBPLIST_LIBVERSION "${LIBPLIST_SOVERSION}.${LIBPLIST_VERSION}" ) 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 ) SET( CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake ${CMAKE_SOURCE_DIR}/cmake/modules )
...@@ -53,7 +53,7 @@ SET ( PLIST_BYTE_ORDER ${endianess} ) ...@@ -53,7 +53,7 @@ SET ( PLIST_BYTE_ORDER ${endianess} )
ADD_SUBDIRECTORY( libcnary ) ADD_SUBDIRECTORY( libcnary )
ADD_SUBDIRECTORY( src ) ADD_SUBDIRECTORY( src )
ADD_SUBDIRECTORY( plutil ) ADD_SUBDIRECTORY( plistutil )
ADD_SUBDIRECTORY( include ) ADD_SUBDIRECTORY( include )
ADD_SUBDIRECTORY( test ) ADD_SUBDIRECTORY( test )
......
...@@ -7,9 +7,9 @@ MACRO( LIBPLIST_PACKAGE _major _minor) ...@@ -7,9 +7,9 @@ MACRO( LIBPLIST_PACKAGE _major _minor)
SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING.LESSER") SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING.LESSER")
SET(CPACK_COMPONENT_LIB_DISPLAY_NAME "PList library") SET(CPACK_COMPONENT_LIB_DISPLAY_NAME "PList library")
SET(CPACK_COMPONENT_DEV_DISPLAY_NAME "PList development files") 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_DEV_DEPENDS lib)
set(CPACK_COMPONENT_PLUTIL_DEPENDS lib) set(CPACK_COMPONENT_PLISTUTIL_DEPENDS lib)
INCLUDE( CPack ) INCLUDE( CPack )
ENDMACRO( LIBPLIST_PACKAGE ) ENDMACRO( LIBPLIST_PACKAGE )
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 )
/* /*
* plutil.C * plistutil.c
* source for plist convertion tool * source for plist convertion tool
* *
* Copyright (c) 2008 Zach C. All Rights Reserved. * Copyright (c) 2008 Zach C. All Rights Reserved.
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#include "plist/plist.h" #include "plist/plist.h"
#include "plutil.h" #include "plistutil.h"
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
......
/* /*
* plutil.h * plistutil.h
* header for plist convertion tool * header for plist convertion tool
* *
* Copyright (c) 2008 Zach C. All Rights Reserved. * Copyright (c) 2008 Zach C. All Rights Reserved.
......
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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment