[PC-BSD Commits] r3974 - pcbsd/trunk-current/libpcbsd

[svn at pcbsd.org]

Author: kris
Date: 2009-05-20 13:17:10 -0700 (Wed, 20 May 2009)
New Revision: 3974

Added:
   pcbsd/trunk-current/libpcbsd/pcbsd-netif.h
   pcbsd/trunk-current/libpcbsd/pcbsd-utils.h
Removed:
   pcbsd/trunk-current/libpcbsd/netif.h
   pcbsd/trunk-current/libpcbsd/utils.h
Modified:
   pcbsd/trunk-current/libpcbsd/CMakeLists.txt
   pcbsd/trunk-current/libpcbsd/netif.cpp
   pcbsd/trunk-current/libpcbsd/utils.cpp
Log:

Updated libpcbsd to make it ready for port installation



Modified: pcbsd/trunk-current/libpcbsd/CMakeLists.txt
===================================================================
--- pcbsd/trunk-current/libpcbsd/CMakeLists.txt	2009-05-20 14:42:28 UTC (rev 3973)
+++ pcbsd/trunk-current/libpcbsd/CMakeLists.txt	2009-05-20 20:17:10 UTC (rev 3974)
@@ -6,6 +6,8 @@
 
 add_definitions(${QT_DEFINITIONS})
 
+set (CMAKE_INSTALL_PREFIX /PCBSD/local)
+
 link_directories(${QT_LIB_DIR})
 include_directories(${QT_INCLUDE_DIR} ${QT_QTCORE_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
 
@@ -14,11 +16,16 @@
  utils.cpp
 )
 
+set (pcbsd_HDRS
+ pcbsd-netif.h
+ pcbsd-utils.h
+)
+
 add_library(pcbsd SHARED ${pcbsd_SRCS})
 
 target_link_libraries(pcbsd ${QT_LIBRARIES})
 
 ### INSTALL ###
 
-INSTALL_TARGETS(/../../PCBSD/local/lib pcbsd)
-INSTALL_FILES(/../../PCBSD/includes "([A-Z]|[a-z]|[0-9])+\\.h$")
+INSTALL_TARGETS( "/lib" pcbsd )
+INSTALL_FILES( "/include" "([A-Z]|[a-z]|[0-9])+\\.h$" )

Modified: pcbsd/trunk-current/libpcbsd/netif.cpp
===================================================================
--- pcbsd/trunk-current/libpcbsd/netif.cpp	2009-05-20 14:42:28 UTC (rev 3973)
+++ pcbsd/trunk-current/libpcbsd/netif.cpp	2009-05-20 20:17:10 UTC (rev 3974)
@@ -39,8 +39,8 @@
 #include <qregexp.h>
 #include <qstring.h>
 
-#include "netif.h"
-#include "utils.h"
+#include "pcbsd-netif.h"
+#include "pcbsd-utils.h"
 
 QStringList NetworkInterface::getInterfaces()
 {

Modified: pcbsd/trunk-current/libpcbsd/utils.cpp
===================================================================
--- pcbsd/trunk-current/libpcbsd/utils.cpp	2009-05-20 14:42:28 UTC (rev 3973)
+++ pcbsd/trunk-current/libpcbsd/utils.cpp	2009-05-20 20:17:10 UTC (rev 3974)
@@ -27,7 +27,7 @@
 
 #include <qstring.h>
 
-#include "utils.h"
+#include "pcbsd-utils.h"
 
 QString Utils::sysctl(QString sysctl)
 {