[Kst] branches/work/kst/portto4/kst/cmake

[Peter Kümmel]

SVN commit 1221542 by kuemmel:

add libdir option

 M  +6 -0      CMakeLists.txt  
 M  +1 -1      modules/KstMacros.cmake  


--- branches/work/kst/portto4/kst/cmake/CMakeLists.txt #1221541:1221542
@@ -22,6 +22,7 @@
 kst_option(merge_rebuild "Rebuild generated files from merged files build" OFF all)
 kst_option(verbose "Make verbose CMake run and Makefiles" OFF all)
 kst_option(install_prefix "Install path for Kst, using a default if not set" OFF all)
+kst_option(install_libdir "Install directory name for libraries" OFF all)
 kst_option(console "Open console on Windows" OFF win)
 kst_option(3rdparty "Build plugins depending on 3rd party libraries" ON all)
 kst_option(3rdparty_download "Download precompiled 3rd party libraries" OFF win)
@@ -114,6 +115,11 @@
 	set(CMAKE_INSTALL_PREFIX INSTALLED CACHE PATH "Kst's default install prefix" FORCE)
 endif()
 
+if(kst_install_libdir)
+	set(kst_install_libdir lib)
+endif()
+
+
 if(NOT kst_console)
 	set(kst_win32 WIN32)
 	set(kst_qtmain_library ${QT_QTMAIN_LIBRARY})
--- branches/work/kst/portto4/kst/cmake/modules/KstMacros.cmake #1221541:1221542
@@ -120,7 +120,7 @@
 			install(TARGETS ${kst_name} RUNTIME DESTINATION bin)
 		endif()
 	elseif(NOT APPLE)
-		install(TARGETS ${kst_name} DESTINATION lib)
+		install(TARGETS ${kst_name} DESTINATION ${kst_install_libdir})
 	endif()
 endmacro()