mirror of
				https://github.com/pocoproject/poco.git
				synced 2025-10-29 20:59:45 +01:00 
			
		
		
		
	CMake: FindMySQL, added Program Files(x86)/MySQL to search path for MySQL
This commit is contained in:
		| @@ -1,3 +1,6 @@ | |||||||
|  | SET(BINDIR32_ENV_NAME "ProgramFiles(x86)") | ||||||
|  | SET(BINDIR32 $ENV{${BINDIR32_ENV_NAME}}) | ||||||
|  |  | ||||||
| find_path(MYSQL_INCLUDE_DIR mysql.h | find_path(MYSQL_INCLUDE_DIR mysql.h | ||||||
| 		/usr/include/mysql | 		/usr/include/mysql | ||||||
| 		/usr/local/include/mysql | 		/usr/local/include/mysql | ||||||
| @@ -8,6 +11,7 @@ find_path(MYSQL_INCLUDE_DIR mysql.h | |||||||
| 		$ENV{MYSQL_INCLUDE_DIR} | 		$ENV{MYSQL_INCLUDE_DIR} | ||||||
| 		$ENV{MYSQL_DIR}/include | 		$ENV{MYSQL_DIR}/include | ||||||
| 		$ENV{ProgramFiles}/MySQL/*/include | 		$ENV{ProgramFiles}/MySQL/*/include | ||||||
|  | 		${BINDIR32}/MySQL/include | ||||||
| 		$ENV{SystemDrive}/MySQL/*/include) | 		$ENV{SystemDrive}/MySQL/*/include) | ||||||
|  |  | ||||||
| if (WIN32) | if (WIN32) | ||||||
| @@ -26,6 +30,7 @@ if (WIN32) | |||||||
| 				 $ENV{MYSQL_DIR}/libmysql/${libsuffixBuild} | 				 $ENV{MYSQL_DIR}/libmysql/${libsuffixBuild} | ||||||
| 				 $ENV{MYSQL_DIR}/client/${libsuffixBuild} | 				 $ENV{MYSQL_DIR}/client/${libsuffixBuild} | ||||||
| 				 $ENV{ProgramFiles}/MySQL/*/lib/${libsuffixDist} | 				 $ENV{ProgramFiles}/MySQL/*/lib/${libsuffixDist} | ||||||
|  | 				 ${BINDIR32}/MySQL/lib | ||||||
| 				 $ENV{SystemDrive}/MySQL/*/lib/${libsuffixDist}) | 				 $ENV{SystemDrive}/MySQL/*/lib/${libsuffixDist}) | ||||||
| else (WIN32) | else (WIN32) | ||||||
| 	find_library(MYSQL_LIB NAMES mysqlclient_r | 	find_library(MYSQL_LIB NAMES mysqlclient_r | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 Torndeco
					Torndeco