Skip to content

Commit c7f1373

Browse files
committed
cmake: Fix default install location to include correct version number
1 parent 2695c3e commit c7f1373

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

install_layout.cmake

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,18 +131,24 @@ set(INSTALL_LIB_DIR_STATIC "${INSTALL_LIB_DIR_STATIC}"
131131

132132
if(NOT CMAKE_INSTALL_PREFIX)
133133

134+
if(CONCPP_PACKAGE_BASE_VERSION)
135+
set(version ${CONCPP_PACKAGE_BASE_VERSION})
136+
else()
137+
set(version ${CONCPP_VERSION})
138+
endif()
139+
134140
if(WIN32)
135141

136142
if(DEFINED ENV{HOMEPATH})
137143
file(TO_CMAKE_PATH "$ENV{HOMEDRIVE}$ENV{HOMEPATH}" install_home)
138144
else()
139145
set(install_home "C:/Program Files (x86)")
140146
endif()
141-
set(CMAKE_INSTALL_PREFIX "${install_home}/MySQL/MySQL Connector C++ ${CONCPP_PACKAGE_BASE_VERSION}")
147+
set(CMAKE_INSTALL_PREFIX "${install_home}/MySQL/MySQL Connector C++ ${version}")
142148

143149
else()
144150

145-
set(CMAKE_INSTALL_PREFIX "/usr/local/mysql/connector-c++-${CONCPP_PACKAGE_BASE_VERSION}")
151+
set(CMAKE_INSTALL_PREFIX "/usr/local/mysql/connector-c++-${version}")
146152

147153
endif()
148154

0 commit comments

Comments
 (0)