[Performous-commit] Lasse Karkkainen : Install libda to performous dir

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

Module: performous
Branch: dance
Commit: c6c4cd031628e321e25d753f27a34b0ba10dba94

Author: Lasse Karkkainen <tro...@tr...>
Date:   Sat Nov 28 10:53:30 2009 +0200

Install libda to performous dir

---

 libs/libda/CMakeLists.txt    |   17 +++++++++++++----
 libs/libda/cmake/config.h.in |    4 +++-
 libs/libda/src/audio.cpp     |    3 ++-
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/libs/libda/CMakeLists.txt b/libs/libda/CMakeLists.txt
index 5c8f5d4..76fe7eb 100644
--- a/libs/libda/CMakeLists.txt
+++ b/libs/libda/CMakeLists.txt
@@ -21,15 +21,24 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
 
 set(LIB_SUFFIX "" CACHE STRING "Optional suffix to use on lib folders (e.g. 64 for lib64)")
 set(LibDA_CMAKE_DIR share/libda/cmake CACHE STRING "Relative path (from prefix) where to put CMake configuration files")
-set(LibDA_PLUGIN_DIR "lib${LIB_SUFFIX}/libda")
+
+if(SLAVE_LIB)
+	set(LibDA_PLUGIN_FOLDER "performous/libda-${LibDA_VERSION_MAJOR}")
+else()
+	set(LibDA_PLUGIN_FOLDER "libda-${LibDA_VERSION_MAJOR}")
+endif()
+
+set(LibDA_PLUGIN_DIR "lib${LIB_SUFFIX}/${LibDA_PLUGIN_FOLDER}")
 
 include_directories(include)
 
+# Store version data in config.h
+set(CONFIG_H ${CMAKE_CURRENT_BINARY_DIR}/libda/config.h)
+configure_file(cmake/config.h.in ${CONFIG_H} ESCAPE_QUOTES @ONLY)
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+
 if(NOT SLAVE_LIB)
 	include(cmake/libda-packaging.cmake)
-	# Store version data in config.h
-	set(CONFIG_H ${CMAKE_CURRENT_BINARY_DIR}/config.h)
-	configure_file(cmake/config.h.in ${CONFIG_H} ESCAPE_QUOTES @ONLY)
 	# Install include files
 	file(GLOB HEADER_FILES "include/libda/*")
 	install(FILES ${HEADER_FILES} ${CONFIG_H} DESTINATION include/libda)
diff --git a/libs/libda/cmake/config.h.in b/libs/libda/cmake/config.h.in
index b08238c..422b249 100644
--- a/libs/libda/cmake/config.h.in
+++ b/libs/libda/cmake/config.h.in
@@ -1,9 +1,11 @@
 #ifndef LIBDA_CONFIG_H
 #define LIBDA_CONFIG_H
 
+// Note C versions use all-capital LIBDA, while CMake has LibDA...
+
 #define LIBDA_VERSION "@LibDA_VERSION@"
 #define LIBDA_VERSION_MAJOR @LibDA_VERSION_MAJOR@
 #define LIBDA_VERSION_MINOR @LibDA_VERSION_MINOR@
-
+#define LIBDA_PLUGIN_FOLDER "@LibDA_PLUGIN_FOLDER@"
 #endif
 
diff --git a/libs/libda/src/audio.cpp b/libs/libda/src/audio.cpp
index 8374a66..5dfb894 100644
--- a/libs/libda/src/audio.cpp
+++ b/libs/libda/src/audio.cpp
@@ -2,6 +2,7 @@
 #include <libda/audio_dev.hpp>
 #undef BUILDING_DLL
 
+#include <libda/config.h>
 #include <plugin++/loader.hpp>
 #include <ostream>
 #include <limits>
@@ -13,7 +14,7 @@ namespace da {
 	class init_impl {
 		plugin::loader m_loader;
 	  public:
-		init_impl(): m_loader("libda") {}
+		init_impl(): m_loader(LIBDA_PLUGIN_FOLDER) {}
 	};
 
 	initialize::initialize(): m_impl(new init_impl) {}