[Performous-commit] Lasse Karkkainen : Use LibDA external target

[Lasse Kärkkäi. <tr...@us...>]

Module: performous
Branch: master
Commit: 5e0d5cce3c3cc805d8da3aa99eae1a01f5dd7bde

Author: Lasse Karkkainen <tro...@tr...>
Date:   Tue Nov 24 14:16:50 2009 +0200

Use LibDA external target

---

 game/CMakeLists.txt |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/game/CMakeLists.txt b/game/CMakeLists.txt
index c04125d..846eb1a 100644
--- a/game/CMakeLists.txt
+++ b/game/CMakeLists.txt
@@ -12,7 +12,7 @@ include_directories(${Boost_INCLUDE_DIRS})
 set(LIBS ${LIBS} ${Boost_LIBRARIES})
 
 # Find all the libs that don't require extra parameters
-foreach(lib SDL PangoCairo LibRSVG LibXML++ Magick++ GLEW AVFormat SWScale OpenGL)
+foreach(lib LibDA SDL PangoCairo LibRSVG LibXML++ Magick++ GLEW AVFormat SWScale OpenGL)
 	find_package(${lib} REQUIRED)
 	include_directories(${${lib}_INCLUDE_DIRS})
 	set(LIBS ${LIBS} ${${lib}_LIBRARIES})
@@ -36,13 +36,13 @@ if(CMAKE_COMPILER_IS_GNUCXX)
 endif(CMAKE_COMPILER_IS_GNUCXX)
 
 add_executable(performous ${SOURCES} ${SDL_SOURCES})
-target_link_libraries(performous da ${LIBS})
+target_link_libraries(performous ${LIBS})
 
 # Store library paths in executable
 if(APPLE)
-	set_target_properties(performous PROPERTIES INSTALL_RPATH_USE_LINK_PATH TRUE INSTALL_RPATH @loader_path/../lib${LIB_SUFFIX})
+	set_target_properties(performous PROPERTIES INSTALL_RPATH_USE_LINK_PATH TRUE INSTALL_RPATH "@loader_path/../lib${LIB_SUFFIX}:@loader_path/../../lib${LIB_SUFFIX}")
 else()
-	set_target_properties(performous PROPERTIES INSTALL_RPATH_USE_LINK_PATH TRUE INSTALL_RPATH \$ORIGIN/../lib${LIB_SUFFIX})
+	set_target_properties(performous PROPERTIES INSTALL_RPATH_USE_LINK_PATH TRUE INSTALL_RPATH "\$ORIGIN/../lib${LIB_SUFFIX}:\$ORIGIN/../../lib${LIB_SUFFIX}")
 endif()
 
 # Generate config.hh