allow specifying destination directory for libs via CMAKE_INSTALL_LIBDIR

git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1794 0778d3d1-df1d-0410-868b-ea421aaaa00d
This commit is contained in:
Tobias Doerffel
2008-10-25 10:14:56 +00:00
parent 9e4e576de9
commit 63848e9b71
2 changed files with 13 additions and 5 deletions

View File

@@ -1,5 +1,8 @@
2008-10-25 Tobias Doerffel <tobydox/at/users/dot/sourceforge/dot/net>
* cmake/modules/DetectMachine.cmake:
allow specifying destination directory for libs via CMAKE_INSTALL_LIBDIR
* src/core/sample_buffer.cpp:
- fixed out-of-boundary array access when reversing samples
- optimized loops for loading samples

View File

@@ -26,11 +26,16 @@ ELSE(${Machine} MATCHES "i686" OR ${Machine} MATCHES "i386" )
ENDIF(${Machine} MATCHES "x86_64")
ENDIF(${Machine} MATCHES "i686" OR ${Machine} MATCHES "i386" )
IF(LMMS_HOST_X86_64)
SET(LIB_DIR lib64)
ELSE(LMMS_HOST_X86_64)
SET(LIB_DIR lib)
ENDIF(LMMS_HOST_X86_64)
IF(CMAKE_INSTALL_LIBDIR)
SET(LIB_DIR "${CMAKE_INSTALL_LIBDIR}")
ELSE(CMAKE_INSTALL_LIBDIR)
IF(LMMS_HOST_X86_64)
SET(LIB_DIR lib64)
ELSE(LMMS_HOST_X86_64)
SET(LIB_DIR lib)
ENDIF(LMMS_HOST_X86_64)
ENDIF(CMAKE_INSTALL_LIBDIR)
IF(LMMS_BUILD_WIN32)
SET(PLUGIN_DIR plugins)