[Performous-commit] Lasse Karkkainen : Use static linkage on libs to avoid installing them, remove relative RPATHs

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

Module: performous
Branch: master
Commit: d7a662fd6f74836c84b4548a1a0c5bdfb8feb74f

Author: Lasse Karkkainen <tro...@tr...>
Date:   Fri Nov 27 16:31:32 2009 +0200

Use static linkage on libs to avoid installing them, remove relative RPATHs

---

 game/CMakeLists.txt           |    4 ++--
 libs/libda/src/CMakeLists.txt |    2 +-
 libs/plugin++/CMakeLists.txt  |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/game/CMakeLists.txt b/game/CMakeLists.txt
index 951e708..1e9e60e 100644
--- a/game/CMakeLists.txt
+++ b/game/CMakeLists.txt
@@ -48,9 +48,9 @@ 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}:@loader_path/../../lib${LIB_SUFFIX}")
+	set_target_properties(performous PROPERTIES INSTALL_RPATH_USE_LINK_PATH TRUE)
 else()
-	set_target_properties(performous PROPERTIES INSTALL_RPATH_USE_LINK_PATH TRUE INSTALL_RPATH "\$ORIGIN/../lib${LIB_SUFFIX}:\$ORIGIN/../../lib${LIB_SUFFIX}")
+	set_target_properties(performous PROPERTIES INSTALL_RPATH_USE_LINK_PATH TRUE)
 endif()
 
 # Generate config.hh
diff --git a/libs/libda/src/CMakeLists.txt b/libs/libda/src/CMakeLists.txt
index a767b7d..f98f903 100644
--- a/libs/libda/src/CMakeLists.txt
+++ b/libs/libda/src/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 2.6)
 
-add_library(da SHARED audio.cpp)
+add_library(da STATIC audio.cpp)
 target_link_libraries(da ${Boost_LIBRARIES} ${Plugin++_LIBRARIES})
 
 set_target_properties(da PROPERTIES
diff --git a/libs/plugin++/CMakeLists.txt b/libs/plugin++/CMakeLists.txt
index b8e8b16..d311340 100644
--- a/libs/plugin++/CMakeLists.txt
+++ b/libs/plugin++/CMakeLists.txt
@@ -28,7 +28,7 @@ if(CMAKE_COMPILER_IS_GNUCXX)
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98 -Wall -Wextra")
 endif()
 
-add_library(plugin++ SHARED src/dll.cc src/execname.cc src/loader.cc)
+add_library(plugin++ STATIC src/dll.cc src/execname.cc src/loader.cc)
 
 find_package(DL REQUIRED)
 include_directories(${DL_INCLUDE_DIRS})