[PC-BSD Commits] r4230 - pcbsd/trunk/pcbsd-netmanager

svn at pcbsd.org svn at pcbsd.org
Tue Jul 14 09:26:06 PDT 2009


Author: kris
Date: 2009-07-14 09:26:06 -0700 (Tue, 14 Jul 2009)
New Revision: 4230

Modified:
   pcbsd/trunk/pcbsd-netmanager/CMakeLists.txt
Log:

Fixed cmake build errors with pcbsd-netmanager



Modified: pcbsd/trunk/pcbsd-netmanager/CMakeLists.txt
===================================================================
--- pcbsd/trunk/pcbsd-netmanager/CMakeLists.txt	2009-07-14 14:46:17 UTC (rev 4229)
+++ pcbsd/trunk/pcbsd-netmanager/CMakeLists.txt	2009-07-14 16:26:06 UTC (rev 4230)
@@ -1,8 +1,6 @@
 PROJECT (pcbsd-networkmanager)
 #set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)
 cmake_minimum_required(VERSION 2.4.0)
-set(PC_INCLUDE ${CMAKE_INSTALL_PREFIX}/include)
-set(PC_LINK ${CMAKE_INSTALL_PREFIX}/lib)
 
 IF(NOT CMAKE_BUILD_TYPE)
   SET(CMAKE_BUILD_TYPE Release CACHE STRING
@@ -12,6 +10,7 @@
 
 find_package(Qt4 REQUIRED)
 find_package(KDE4 REQUIRED)
+find_package(X11 REQUIRED)
 include(FindAutomoc4)
 include(KDE4Defaults)
 include(UseQt4)
@@ -21,9 +20,9 @@
 
 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}  ${KDE4_ENABLE_EXCEPTIONS}")
 
-LINK_DIRECTORIES(${KDE4_LIB_DIR})
+LINK_DIRECTORIES(${KDE4_LIB_DIR} ${X11_LIB_SEARCH_PATH})
 
-INCLUDE_DIRECTORIES( ${KDE4_INCLUDE_DIR} ${QT_INCLUDE_DIR} ${PC_INCLUDE} ${CMAKE_INCLUDE_PATH} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
+INCLUDE_DIRECTORIES( ${KDE4_INCLUDE_DIR} ${QT_INCLUDE_DIR} ${X11_INCLUDE_DIR} ${CMAKE_INCLUDE_PATH} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} )
 
 add_subdirectory(src)
 



More information about the Commits mailing list