← Back to team overview

zorba-coders team mailing list archive

[Merge] lp:~zorba-coders/zorba/add-libuuid-dependency into lp:zorba

 

Till Westmann has proposed merging lp:~zorba-coders/zorba/add-libuuid-dependency into lp:zorba.

Requested reviews:
  Till Westmann (tillw)
  Juan Zacarias (juan457)

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/add-libuuid-dependency/+merge/122731

add dependency on libuuid
-- 
https://code.launchpad.net/~zorba-coders/zorba/add-libuuid-dependency/+merge/122731
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'CMakeCompiler.txt'
--- CMakeCompiler.txt	2012-08-30 23:50:09 +0000
+++ CMakeCompiler.txt	2012-09-04 18:13:19 +0000
@@ -250,7 +250,7 @@
   SET(requiredlibs ${requiredlibs} "Rpcrt4")
 ELSEIF (ZORBA_HAVE_UUID_H)
   # Needed for uuid_generate() function in util/uuid.c.
-  SET(CMAKE_SHARED_LINKER_FLAGS "-luuid ${CMAKE_SHARED_LINKER_FLAGS}")
+  SET(requiredlibs ${requiredlibs} "uuid")
   # Double-check that we can link against the required library.
   CHECK_LIBRARY_EXISTS(uuid uuid_generate "" LIBUUID_EXISTS)
   IF (NOT LIBUUID_EXISTS)


Follow ups