[Frugalware-git] pacman-g2: * added some intall support for cmake

[Marius Cirsta]

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=e080b2080c162e657c004c8f0fe9723de11c39d7

commit e080b2080c162e657c004c8f0fe9723de11c39d7
Author: Marius Cirsta <mcirsta at frugalware.org>
Date:   Mon Apr 9 01:27:36 2012 +0000

* added some intall support for cmake

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4a390bf..6a3b06b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,10 @@
cmake_minimum_required (VERSION 2.8)
project (PACMAN-G2)

+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_GNU_SOURCE")
+
add_subdirectory (lib/libftp)
add_subdirectory (lib/libpacman)
+add_subdirectory (src/versort)
+add_subdirectory (src/vercmp)
add_subdirectory (src/pacman-g2)
diff --git a/lib/libftp/CMakeLists.txt b/lib/libftp/CMakeLists.txt
index f336e18..bd247e7 100644
--- a/lib/libftp/CMakeLists.txt
+++ b/lib/libftp/CMakeLists.txt
@@ -1 +1,3 @@
add_library(ftp SHARED ftplib.c)
+
+install(TARGETS ftp DESTINATION lib)
diff --git a/lib/libpacman/CMakeLists.txt b/lib/libpacman/CMakeLists.txt
index 25f0c18..1fb4897 100644
--- a/lib/libpacman/CMakeLists.txt
+++ b/lib/libpacman/CMakeLists.txt
@@ -30,8 +30,6 @@ include_directories (${PACMAN-G2_SOURCE_DIR})

include_directories (${PACMAN-G2_SOURCE_DIR}/lib/libftp)

-link_directories (${PACMAN-G2_SOURCE_DIR}/lib/libftp)
-
find_library(ARCHIVE_LIB archive)

SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_LARGEFILE64_SOURCE")
@@ -39,3 +37,5 @@ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_LARGEFILE64_SOURCE")
add_library(pacman SHARED ${LIBPACMAN_SOURCES})

target_link_libraries(pacman ftp archive)
+
+install(TARGETS pacman DESTINATION lib)
diff --git a/src/pacman-g2/CMakeLists.txt b/src/pacman-g2/CMakeLists.txt
index 9c03e28..20458e9 100644
--- a/src/pacman-g2/CMakeLists.txt
+++ b/src/pacman-g2/CMakeLists.txt
@@ -18,10 +18,10 @@ set(PACMAN_SOURCES

include_directories (${PACMAN-G2_SOURCE_DIR})

-link_directories (${HELLO_BINARY_DIR}/lib/libpacman)
-
find_library(M_LIB m)

add_executable(pacman-g2 ${PACMAN_SOURCES})

target_link_libraries(pacman-g2 pacman ${M_LIB})
+
+install(TARGETS pacman-g2 DESTINATION bin)
diff --git a/src/pacman-g2/pacman-g2.c b/src/pacman-g2/pacman-g2.c
index 8f90a1c..9935f77 100644
--- a/src/pacman-g2/pacman-g2.c
+++ b/src/pacman-g2/pacman-g2.c
@@ -30,16 +30,7 @@
#include <unistd.h>
#include <libintl.h>
#include <locale.h>
-#if defined(__APPLE__)
-#include <malloc/malloc.h>
-#elif defined(__OpenBSD__) || defined(__APPLE__)
-#include <sys/malloc.h>
-#include <sys/types.h>
-#elif defined(CYGWIN)
-#include <libgen.h> /* basename */
-#else
#include <mcheck.h> /* debug */
-#endif
#include <time.h>

#include <pacman.h>
@@ -60,10 +51,6 @@

#define PACCONF "/etc/pacman-g2.conf"

-#if defined(__OpenBSD__) || defined(__APPLE__)
-#define BSD
-#endif
-
/* Operations */
enum {
PM_OP_MAIN = 1,
diff --git a/src/vercmp/CMakeLists.txt b/src/vercmp/CMakeLists.txt
new file mode 100644
index 0000000..41db3b9
--- /dev/null
+++ b/src/vercmp/CMakeLists.txt
@@ -0,0 +1,7 @@
+#include_directories (${PACMAN-G2_SOURCE_DIR})
+
+add_executable(vercmp vercmp.c)
+
+target_link_libraries(vercmp pacman)
+
+install(TARGETS vercmp DESTINATION bin)
diff --git a/src/versort/CMakeLists.txt b/src/versort/CMakeLists.txt
new file mode 100644
index 0000000..9af75ed
--- /dev/null
+++ b/src/versort/CMakeLists.txt
@@ -0,0 +1,9 @@
+include_directories (${PACMAN-G2_SOURCE_DIR})
+
+include_directories (${PACMAN-G2_SOURCE_DIR}/lib/libpacman)
+
+add_executable(versort versort.c)
+
+target_link_libraries(versort pacman)
+
+install(TARGETS versort DESTINATION bin)