If CMake 2.8.5 or higher, use the "GNUInstallDirs" module to

kboortz · kboortz · commit 61c4af015a4b · 2014-06-22T18:11:10.000+02:00
find if to install libraries into "lib" or "lib64". Without this, the RPM build on SLES11 fails, see http://public.kitware.com/Bug/view.php?id=11964
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -25,20 +25,23 @@
 
 PROJECT(MYSQLCPPCONN)
 
-IF(WIN32)
-# We need this for mysqlcppconn_EXPORTS needed for the static build
-	cmake_minimum_required(VERSION 2.6.2)
-ELSE(WIN32)
-	cmake_minimum_required(VERSION 2.6)
-ENDIF(WIN32)
+cmake_minimum_required(VERSION 2.6.2)
 
 if(COMMAND cmake_policy AND POLICY CMP0015)
 	cmake_policy(SET CMP0015 NEW)
 endif(COMMAND cmake_policy AND POLICY CMP0015)
 
-
 INCLUDE(VersionInfo.cmake)
 
+OPTION(TAR_LAYOUT "Use directory layout for an unpacked TAR install")
+
+IF(TAR_LAYOUT OR NOT CMAKE_VERSION OR CMAKE_VERSION VERSION_LESS "2.8.5")
+  SET(INSTALL_LIBDIR lib)
+ELSE()
+  INCLUDE(GNUInstallDirs)
+  SET(INSTALL_LIBDIR ${CMAKE_INSTALL_LIBDIR})
+ENDIF()
+
 SET(EDIT_WARNING_MESSAGE "Please do not edit this file - it is generated by cmake. Edit its source file instead.")
 
 # Configuring header file with driver version info
diff --git a/driver/CMakeLists.txt b/driver/CMakeLists.txt
@@ -309,8 +309,8 @@ IF(WIN32)
 	)
 ELSE(WIN32)
 	INSTALL(TARGETS mysqlcppconn mysqlcppconn-static
-		LIBRARY DESTINATION lib
-		ARCHIVE DESTINATION lib
+		LIBRARY DESTINATION ${INSTALL_LIBDIR}
+		ARCHIVE DESTINATION ${INSTALL_LIBDIR}
 	)
 ENDIF(WIN32)
 
diff --git a/thread/CMakeLists.txt b/thread/CMakeLists.txt
@@ -72,8 +72,8 @@ IF(WIN32)
 	)
 ELSE(WIN32)
 	INSTALL(TARGETS mysqlcppconn_thread mysqlcppconn_thread-static
-		LIBRARY DESTINATION lib
-		ARCHIVE DESTINATION lib
+		LIBRARY DESTINATION ${INSTALL_LIBDIR}
+		ARCHIVE DESTINATION ${INSTALL_LIBDIR}
 	)
 ENDIF(WIN32)
 

Original file line number	Diff line number	Diff line change
`@@ -309,8 +309,8 @@ IF(WIN32)`
`309`	`309`	`)`
`310`	`310`	`ELSE(WIN32)`
`311`	`311`	`INSTALL(TARGETS mysqlcppconn mysqlcppconn-static`
`312`		`- LIBRARY DESTINATION lib`
`313`		`- ARCHIVE DESTINATION lib`
	`312`	`+ LIBRARY DESTINATION ${INSTALL_LIBDIR}`
	`313`	`+ ARCHIVE DESTINATION ${INSTALL_LIBDIR}`
`314`	`314`	`)`
`315`	`315`	`ENDIF(WIN32)`
`316`	`316`
Original file line number	Diff line number	Diff line change
`@@ -72,8 +72,8 @@ IF(WIN32)`
`72`	`72`	`)`
`73`	`73`	`ELSE(WIN32)`
`74`	`74`	`INSTALL(TARGETS mysqlcppconn_thread mysqlcppconn_thread-static`
`75`		`- LIBRARY DESTINATION lib`
`76`		`- ARCHIVE DESTINATION lib`
	`75`	`+ LIBRARY DESTINATION ${INSTALL_LIBDIR}`
	`76`	`+ ARCHIVE DESTINATION ${INSTALL_LIBDIR}`
`77`	`77`	`)`
`78`	`78`	`ENDIF(WIN32)`
`79`	`79`