Skip to content

Commit fa20373

Browse files
committed
Fix BUILDINFO placement on RPM
1 parent 76e8c50 commit fa20373

File tree

3 files changed

+2
-17
lines changed

3 files changed

+2
-17
lines changed

CMakeLists.txt

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -356,16 +356,6 @@ MESSAGE(STATUS "Environment link flags: ${MYSQLCPPCONN_LINK_FLAGS_ENV}")
356356
CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/cppconn/version_info.h.cmake
357357
${CMAKE_BINARY_DIR}/cppconn/version_info.h @ONLY)
358358

359-
360-
361-
#Add build info to the readme
362-
SET(CONNECTOR_COMPILE_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_LINK_FLAGS}")
363-
SET(CONNECTOR_COMPILER "${CMAKE_CXX_COMPILER_ID}")
364-
SET(CONNECTOR_COMPILER_VERSION "${CMAKE_CXX_COMPILER_VERSION}")
365-
366-
configure_file(${CMAKE_SOURCE_DIR}/README.cmake.in
367-
${CMAKE_BINARY_DIR}/README @ONLY)
368-
369359
#
370360
# ----------------------------------------------------------------------
371361
# Create package script
@@ -417,7 +407,7 @@ SET(CPACK_RPM_PACKAGE_DESCRIPTION
417407
in the manual for further info.")
418408

419409
SET(CPACK_RESOURCE_FILE_LICENSE "${LICENSE_FILENAME}")
420-
SET(CPACK_RESOURCE_FILE_README "${CMAKE_BINARY_DIR}/README")
410+
SET(CPACK_RESOURCE_FILE_README "${CMAKE_SOURCE_DIR}/README")
421411
SET(CPACK_SOURCE_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${MYSQLCPPCONN_VERSION}")
422412
SET(CPACK_PACKAGE_INSTALL_DIRECTORY "${CPACK_PACKAGE_NAME}-${MYSQLCPPCONN_VERSION}-${CONNECTOR_PLATFORM}")
423413
IF(WIN32)

README.cmake.in renamed to README

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,3 @@ For the new features/bugfix history, see release notes at
1818

1919
For installation instructions see the relevant sections in the on-line
2020
documentation.
21-
22-
Build Information
23-
Compiler: @CONNECTOR_COMPILER@
24-
Compiler version: @CONNECTOR_COMPILER_VERSION@
25-
Compile flags: @CONNECTOR_COMPILE_FLAGS@

buildinfo.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,5 +75,5 @@ file(APPEND ${buildinfo_out} "MySQL version : ${MYSQL_VERSION}\n"
7575
)
7676
# TODO: Boost version
7777

78-
install(FILES "${buildinfo_out}" DESTINATION .)
78+
install(FILES "${buildinfo_out}" DESTINATION ${DOC_DESTINATION})
7979

0 commit comments

Comments
 (0)