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

Overview Repositories Revisions Requests Users Attributes Meta

File mysql-connector-cpp-1.1.0-cmake-paths-fix.patch of Package mysql-connector-cpp (Revision 07ef9d5908fd5e830d2018e529048911)

Currently displaying revision 07ef9d5908fd5e830d2018e529048911 , Show latest

Index: cppconn/CMakeLists.txt
===================================================================
--- cppconn/CMakeLists.txt.orig
+++ cppconn/CMakeLists.txt
@@ -69,4 +69,4 @@ SET(MYSQLCPPCONN_INSTALL_HEADERS
 		sqlstring.h
 		warning.h)
 
-INSTALL(FILES ${MYSQLCPPCONN_INSTALL_HEADERS} DESTINATION include/cppconn)
+INSTALL(FILES ${MYSQLCPPCONN_INSTALL_HEADERS} DESTINATION include/mysql-connector/cppconn)
Index: driver/CMakeLists.txt
===================================================================
--- driver/CMakeLists.txt.orig
+++ driver/CMakeLists.txt
@@ -23,6 +23,9 @@
 
 LINK_DIRECTORIES(${MYSQLCPPCONN_BOOST_LIBRARY_DIRS})
 
+IF(NOT DEFINED CMAKE_INSTALL_LIB_DIR)
+  SET(CMAKE_INSTALL_LIB_DIR lib)
+ENDIF(NOT DEFINED CMAKE_INSTALL_LIB_DIR)
 
 INCLUDE_DIRECTORIES(${MYSQLCPPCONN_SOURCE_DIR})
 INCLUDE_DIRECTORIES(${MYSQLCPPCONN_SOURCE_DIR}/cppconn)
@@ -271,8 +274,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)
 
@@ -282,7 +285,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.1.0-cmake-paths-fix.patch of Package mysql-connector-cpp (Revision 07ef9d5908fd5e830d2018e529048911)

Places