Merge git://github.com/sirikata/berkelium into chromium11

sirikata · Feb 13, 2012 · 26eb5c2 · 26eb5c2
2 parents b2434c5 + 658a6bb
commit 26eb5c2
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -146,7 +146,7 @@ IF(CHROME_FOUND)
   IF(BERKELIUM_BUILD_DEMOS)
     ADD_EXECUTABLE(ppmrender ${BERKELIUM_TOP_LEVEL}/demo/ppmrender/ppmmain.cpp)
     TARGET_LINK_LIBRARIES(ppmrender ${BERKELIUM_LINK_LIBS})
-    SET_TARGET_PROPERTIES(ppmrender PROPERTIES LINK_FLAGS "${BERKELIUM_LDFLAGS}")
+    SET_TARGET_PROPERTIES(ppmrender PROPERTIES LINK_FLAGS "${BERKELIUM_LDFLAGS} -Wl,-rpath,${CMAKE_CURRENT_BINARY_DIR}")
     SET_TARGET_PROPERTIES(ppmrender PROPERTIES SKIP_BUILD_RPATH ON)
     ADD_DEPENDENCIES(ppmrender libberkelium)
     IF(APPLE)