[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdenetwork/krfb
From:       George Goldberg <grundleborg () googlemail ! com>
Date:       2010-09-28 15:42:17
Message-ID: 20100928154217.EB06BAC88E () svn ! kde ! org
[Download RAW message or body]

SVN commit 1180685 by gberg:

Fix out-of-kdenetwork build to actually work.

 M  +5 -3      CMakeLists.txt  
 A             cmake (directory)  
 A             cmake/modules (directory)  
 A             cmake/modules/COPYING-CMAKE-SCRIPTS  
 A             cmake/modules/FindLibVNCServer.cmake  


--- trunk/KDE/kdenetwork/krfb/CMakeLists.txt #1180684:1180685
@@ -1,15 +1,17 @@
 project(krfb)
 
 if(NOT INSIDE_KDENETWORK)
-    set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/../cmake/modules ${CMAKE_MODULE_PATH})
+    message("Not building inside KDENetwork, loading KDE CMake Macros.")
+
+    set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH})
+
     find_package(KDE4 REQUIRED)
 
     include(KDE4Defaults)
     include(MacroLibrary)
 
     include(CheckSymbolExists)
-    find_package(LibVNCServer)
-    macro_optional_find_package(LibVNCServer)
+    find_package(LibVNCServer REQUIRED)
 
     set(CMAKE_REQUIRED_DEFINITIONS ${_KDE_PLATFORM_DEFINITIONS})
 
[prev in list] [next in list] [prev in thread] [next in thread]