Bug#28045358: Added CMAKE_INSTALL_INCLUDEDIR, CMAKE_INSTALL_LIBDIR and

CMAKE_INSTALL_LIBDIR option
Kudos for Terje Røsten for the mysql-connector-c++.spec.in patch

Author: rsomla1

CMakeLists.txt

@@ -55,6 +55,7 @@ ENDIF()
 set(CMAKE_INSTALL_PREFIX "" CACHE PATH "Install location")
 
 
+
 ##########################################################################
 
 PROJECT(MySQL_CONCPP)

PackageSpecs.cmake

@@ -148,7 +148,7 @@ foreach(file ${info_files})
   set(file_bin "${CMAKE_BINARY_DIR}/${file}${info_ext}")
 
   configure_file("${file_src}" "${file_bin}" NEWLINE_STYLE ${newline})
-  install(FILES "${file_bin}" DESTINATION . COMPONENT Readme)
+  install(FILES "${file_bin}" DESTINATION ${INSTALL_DOC_DIR} COMPONENT Readme)
 
 endforeach()
 

buildinfo.cmake

@@ -112,4 +112,4 @@ if(WITH_JDBC)
 endif()
 
 
-install(FILES "${PROJECT_BINARY_DIR}/BUILDINFO.txt" DESTINATION . COMPONENT Readme)
+install(FILES "${PROJECT_BINARY_DIR}/BUILDINFO.txt" DESTINATION ${INSTALL_DOC_DIR} COMPONENT Readme)

include/mysqlx/CMakeLists.txt

@@ -36,5 +36,5 @@ ADD_HEADERS_DIR(devapi)
 ADD_HEADERS(${headers})
 ADD_HEADER_CHECKS()
 
-INSTALL(FILES ${headers} DESTINATION include/mysqlx COMPONENT XDevAPIDev)
+INSTALL(FILES ${headers} DESTINATION ${INSTALL_INCLUDE_DIR}/mysqlx COMPONENT XDevAPIDev)
 

include/mysqlx/common/CMakeLists.txt

@@ -32,4 +32,4 @@ check_headers(${headers})
 
 ADD_HEADERS(${headers})
 ADD_HEADER_CHECKS()
-INSTALL(FILES ${headers} DESTINATION include/mysqlx/common COMPONENT XDevAPIDev)
+INSTALL(FILES ${headers} DESTINATION ${INSTALL_INCLUDE_DIR}/mysqlx/common COMPONENT XDevAPIDev)

include/mysqlx/devapi/detail/CMakeLists.txt

@@ -33,4 +33,4 @@ check_headers(${headers})
 
 ADD_HEADERS(${headers})
 ADD_HEADER_CHECKS()
-INSTALL(FILES ${headers} DESTINATION include/mysqlx/devapi/detail COMPONENT XDevAPIDev)
+INSTALL(FILES ${headers} DESTINATION ${INSTALL_INCLUDE_DIR}/mysqlx/devapi/detail COMPONENT XDevAPIDev)

install_layout.cmake

@@ -56,20 +56,37 @@ if(NOT DEFINED IS64BIT)
   message(FATAL_ERROR "IS64BIT not defined!")
 endif()
 
+#
+# Default locations, if not overridden with cmake options
+#
+
+set(CMAKE_INSTALL_INCLUDEDIR "include" CACHE STRING
+  "Include Install location (Relative to CMAKE_INSTALL_PREFIX)")
+
 if(IS64BIT)
-  set(INSTALL_LIB_DIR "lib64")
+  set(CMAKE_INSTALL_LIBDIR "lib64" CACHE STRING
+    "Library Install location (Relative to CMAKE_INSTALL_PREFIX)")
 else()
-  set(INSTALL_LIB_DIR "lib")
+  set(CMAKE_INSTALL_LIBDIR "lib" CACHE STRING
+    "Library Install location (Relative to CMAKE_INSTALL_PREFIX)")
 endif()
 
+set(CMAKE_INSTALL_DOCDIR "." CACHE STRING
+  "Doc Install location (Relative to CMAKE_INSTALL_PREFIX)")
+
+#
+# These variables should be used in install specs.
+#
+
+set(INSTALL_LIB_DIR ${CMAKE_INSTALL_LIBDIR})
 
 set(INSTALL_LIB_DIR_STATIC "${INSTALL_LIB_DIR}")
 if(VS)
   set(INSTALL_LIB_DIR_STATIC "${INSTALL_LIB_DIR_STATIC}/${VS}")
 endif()
 
-set(INSTALL_INCLUDE_DIR include)
-set(INSTALL_DOC_DIR doc)
+set(INSTALL_INCLUDE_DIR ${CMAKE_INSTALL_INCLUDEDIR})
+set(INSTALL_DOC_DIR ${CMAKE_INSTALL_DOCDIR})
 
 #
 # Store layout settings in the cache.

packaging/mysql-connector-c++.spec.in

@@ -126,11 +126,13 @@ TEST_OPTS=
 mkdir build-dynamic && pushd build-dynamic
 %if 0%{?fedora} || 0%{?rhel}
 %cmake .. -DCMAKE_BUILD_TYPE=RelWithDebInfo -DWITH_JDBC=ON -DWITH_SSL=system %{?mysql_opt} \
+    -DCMAKE_INSTALL_INCLUDEDIR=%{_includedir}/mysql-cppconn-8 \
     ${TEST_OPTS}
 %else
 cmake .. -DCMAKE_BUILD_TYPE=RelWithDebInfo -DWITH_JDBC=ON -DWITH_SSL=system %{?mysql_opt} \
     ${TEST_OPTS} \
     -DCMAKE_INSTALL_PREFIX="%_prefix" \
+    -DCMAKE_INSTALL_INCLUDEDIR=%{_includedir}/mysql-cppconn-8 \
     -DCMAKE_C_FLAGS:STRING="%optflags" \
     -DCMAKE_CXX_FLAGS:STRING="%optflags"
 %endif
@@ -192,9 +194,7 @@ mv run_unit_tests      %{buildroot}%{_libdir}/mysql-cppconn-8/static/
 %endif
 popd
 
-# Adjust the directory structure for header files
-install -d -m0755 %{buildroot}%{_includedir}/mysql-cppconn-8
-mv %{buildroot}%{_includedir}/{jdbc,mysqlx} %{buildroot}%{_includedir}/mysql-cppconn-8
+# Add compat dir and remove unwanted file
 ln -s mysql-cppconn-8 %{buildroot}%{_includedir}/mysql-cppconn
 rm %{buildroot}/usr/BUILDINFO.txt