changeset 238:62eaf631eb61

Fix compilation issue when gnutls is not in standard directory
author Sebastien Decugis <sdecugis@nict.go.jp>
date Mon, 08 Mar 2010 14:52:01 +0900
parents 5ba7a37a6732
children aba4342b5916
files INSTALL.FreeBSD extensions/CMakeLists.txt
diffstat 2 files changed, 20 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/INSTALL.FreeBSD	Mon Mar 08 14:23:28 2010 +0900
+++ b/INSTALL.FreeBSD	Mon Mar 08 14:52:01 2010 +0900
@@ -32,7 +32,7 @@
 3) Install mercurial (optional)
   (replace "cmake" by "mercurial" in the previous command) 
 
-4) Install flex and bison.
+4) Install flex and bison, same way.
 
 5) Retrieve freeDiameter source code:
    # cd ~
@@ -43,6 +43,15 @@
    # cd fD-build
    
 7) Run cmake for freeDiameter (add other flags as you see fit, see INSTALL for more details)
-   # cmake -DFLEX_EXECUTABLE:FILEPATH=/usr/local/bin/flex ../freeDiameter
+   # /usr/local/bin/cmake -DFLEX_EXECUTABLE:FILEPATH=/usr/local/bin/flex ../freeDiameter
 
 8) make, run, enjoy :)
+
+------
+STATUS
+------
+*) clock_nanosleep:
+  This function will prevent the build of the tests, it needs to be fixed (TODO)
+  Workaround: use -DSKIP_TESTS:BOOL=ON
+  
+*)
--- a/extensions/CMakeLists.txt	Mon Mar 08 14:23:28 2010 +0900
+++ b/extensions/CMakeLists.txt	Mon Mar 08 14:52:01 2010 +0900
@@ -12,6 +12,15 @@
   SET_TARGET_PROPERTIES(${EXTNAME} PROPERTIES SUFFIX ".fdx" )
 ENDMACRO(FD_ADD_EXTENSION)
 
+# The extensions include the headers of freeDiameter that contains gnutls objects
+FIND_PACKAGE(GNUTLS REQUIRED)
+INCLUDE_DIRECTORIES(${GNUTLS_INCLUDE_DIRS})
+find_path(GCRYPT_INCLUDE_DIR NAMES gcrypt.h)
+If ( NOT GCRYPT_INCLUDE_DIR )
+	MESSAGE(SEND_ERROR "Unable to find gcrypt.h, please install libgcrypt-dev or equivalent")
+Endif ( NOT GCRYPT_INCLUDE_DIR )
+INCLUDE_DIRECTORIES(${GCRYPT_INCLUDE_DIR})
+
 ###########################
 # Extensions section
 
"Welcome to our mercurial repository"