File mysql-connector-cpp-1.0.4-beta-cmake-paths-fix.... of Package mysql-connector-cpp

Overview Repositories Revisions Requests Users Attributes Meta

File mysql-connector-cpp-1.0.4-beta-cmake-paths-fix.patch of Package mysql-connector-cpp

Index: mysql-connector-c++-1.0.5/cppconn/CMakeLists.txt
===================================================================
--- mysql-connector-c++-1.0.5.orig/cppconn/CMakeLists.txt
+++ mysql-connector-c++-1.0.5/cppconn/CMakeLists.txt
@@ -55,4 +55,4 @@ SET(MYSQLCPPCONN_INSTALL_HEADERS
 		statement.h
 		warning.h)
 
-INSTALL(FILES ${MYSQLCPPCONN_INSTALL_HEADERS} DESTINATION include/cppconn)
+INSTALL(FILES ${MYSQLCPPCONN_INSTALL_HEADERS} DESTINATION include/mysql-connector/cppconn)
Index: mysql-connector-c++-1.0.5/driver/CMakeLists.txt
===================================================================
--- mysql-connector-c++-1.0.5.orig/driver/CMakeLists.txt
+++ mysql-connector-c++-1.0.5/driver/CMakeLists.txt
@@ -13,6 +13,9 @@ ADD_DEFINITIONS("-DCPPCONN_LIB_BUILD")
 INCLUDE_DIRECTORIES(${MYSQLCPPCONN_SOURCE_DIR})
 INCLUDE_DIRECTORIES(${MYSQLCPPCONN_SOURCE_DIR}/cppconn)
 
+IF(NOT DEFINED CMAKE_INSTALL_LIB_DIR)
+  SET(CMAKE_INSTALL_LIB_DIR lib)
+ENDIF(NOT DEFINED CMAKE_INSTALL_LIB_DIR)
 
 SET(MYSQLCPPCONN_TRACE_ENABLE 0 CACHE BOOL "trace-enabled")
 
@@ -147,8 +150,8 @@ IF(WIN32)
 	)
 ELSE(WIN32)
 	INSTALL(TARGETS mysqlcppconn mysqlcppconn-static
-		LIBRARY DESTINATION lib
-		ARCHIVE DESTINATION lib
+		LIBRARY DESTINATION ${CMAKE_INSTALL_LIB_DIR}
+		ARCHIVE DESTINATION ${CMAKE_INSTALL_LIB_DIR}
 	)
 ENDIF(WIN32)
 
@@ -158,7 +161,7 @@ SET(MYSQLCPPCONN_SPECIFIC_INSTALL_HEADER
 		mysql_connection.h
 		mysql_driver.h)
 
-INSTALL(FILES ${MYSQLCPPCONN_SPECIFIC_INSTALL_HEADERS} DESTINATION include)
+INSTALL(FILES ${MYSQLCPPCONN_SPECIFIC_INSTALL_HEADERS} DESTINATION include/mysql-connector)
 
 
 MESSAGE(STATUS "Configuring driver")

Places

File mysql-connector-cpp-1.0.4-beta-cmake-paths-fix.patch of Package mysql-connector-cpp

Places