summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CMakeLists.txt4
-rw-r--r--cmake/libplistPackaging.cmake4
-rw-r--r--plistutil/CMakeLists.txt9
-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.txt9
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" )
5SET( LIBPLIST_SOVERSION "1" ) 5SET( LIBPLIST_SOVERSION "1" )
6SET( LIBPLIST_VERSION "${LIBPLIST_VERSION_MAJOR}.${LIBPLIST_VERSION_MINOR}" ) 6SET( LIBPLIST_VERSION "${LIBPLIST_VERSION_MAJOR}.${LIBPLIST_VERSION_MINOR}" )
7SET( LIBPLIST_LIBVERSION "${LIBPLIST_SOVERSION}.${LIBPLIST_VERSION}" ) 7SET( LIBPLIST_LIBVERSION "${LIBPLIST_SOVERSION}.${LIBPLIST_VERSION}" )
8SET( PLUTIL_VERSION ${LIBPLIST_VERSION} ) 8SET( PLISTUTIL_VERSION ${LIBPLIST_VERSION} )
9 9
10SET( CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake ${CMAKE_SOURCE_DIR}/cmake/modules ) 10SET( CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake ${CMAKE_SOURCE_DIR}/cmake/modules )
11 11
@@ -53,7 +53,7 @@ SET ( PLIST_BYTE_ORDER ${endianess} )
53 53
54ADD_SUBDIRECTORY( libcnary ) 54ADD_SUBDIRECTORY( libcnary )
55ADD_SUBDIRECTORY( src ) 55ADD_SUBDIRECTORY( src )
56ADD_SUBDIRECTORY( plutil ) 56ADD_SUBDIRECTORY( plistutil )
57ADD_SUBDIRECTORY( include ) 57ADD_SUBDIRECTORY( include )
58ADD_SUBDIRECTORY( test ) 58ADD_SUBDIRECTORY( test )
59 59
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)
7 SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING.LESSER") 7 SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING.LESSER")
8 SET(CPACK_COMPONENT_LIB_DISPLAY_NAME "PList library") 8 SET(CPACK_COMPONENT_LIB_DISPLAY_NAME "PList library")
9 SET(CPACK_COMPONENT_DEV_DISPLAY_NAME "PList development files") 9 SET(CPACK_COMPONENT_DEV_DISPLAY_NAME "PList development files")
10 SET(CPACK_COMPONENT_PLUTIL_DISPLAY_NAME "PList conversion tool") 10 SET(CPACK_COMPONENT_PLISTUTIL_DISPLAY_NAME "PList conversion tool")
11 set(CPACK_COMPONENT_DEV_DEPENDS lib) 11 set(CPACK_COMPONENT_DEV_DEPENDS lib)
12 set(CPACK_COMPONENT_PLUTIL_DEPENDS lib) 12 set(CPACK_COMPONENT_PLISTUTIL_DEPENDS lib)
13 INCLUDE( CPack ) 13 INCLUDE( CPack )
14 14
15ENDMACRO( LIBPLIST_PACKAGE ) 15ENDMACRO( 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 @@
1
2SET(plistutil_SRC
3 plistutil.c)
4
5ADD_EXECUTABLE(plistutil ${plistutil_SRC})
6TARGET_LINK_LIBRARIES(plistutil plist)
7SET_TARGET_PROPERTIES( plistutil PROPERTIES VERSION ${PLISTUTIL_VERSION} )
8
9INSTALL( 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 @@
1/* 1/*
2 * plutil.C 2 * plistutil.c
3 * source for plist convertion tool 3 * source for plist convertion tool
4 * 4 *
5 * Copyright (c) 2008 Zach C. All Rights Reserved. 5 * Copyright (c) 2008 Zach C. All Rights Reserved.
@@ -21,7 +21,7 @@
21 21
22 22
23#include "plist/plist.h" 23#include "plist/plist.h"
24#include "plutil.h" 24#include "plistutil.h"
25 25
26#include <stdio.h> 26#include <stdio.h>
27#include <stdlib.h> 27#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 @@
1/* 1/*
2 * plutil.h 2 * plistutil.h
3 * header for plist convertion tool 3 * header for plist convertion tool
4 * 4 *
5 * Copyright (c) 2008 Zach C. All Rights Reserved. 5 * 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 @@
1
2SET(plutil_SRC
3 plutil.c)
4
5ADD_EXECUTABLE(plutil ${plutil_SRC})
6TARGET_LINK_LIBRARIES(plutil plist)
7SET_TARGET_PROPERTIES( plutil PROPERTIES VERSION ${PLUTIL_VERSION} )
8
9INSTALL( TARGETS plutil RUNTIME DESTINATION bin COMPONENT plutil ) \ No newline at end of file