mirror of
				https://github.com/kkos/oniguruma
				synced 2025-10-30 08:05:50 +08:00 
			
		
		
		
	fix: #266: Incorrect libdir path when built with prefix
This commit is contained in:
		| @ -166,6 +166,12 @@ configure_package_config_file( | ||||
|     INSTALL_DESTINATION "${config_install_dir}" | ||||
| ) | ||||
|  | ||||
| if(CMAKE_INSTALL_LIBDIR MATCHES "^/") | ||||
|     set(onig_pkgconfig_libdir "${CMAKE_INSTALL_LIBDIR}") | ||||
| else() | ||||
|     set(onig_pkgconfig_libdir "\${exec_prefix}/${CMAKE_INSTALL_LIBDIR}") | ||||
| endif() | ||||
|  | ||||
| # Targets: | ||||
| #   * <prefix>/lib*/libonig.a | ||||
| #   * header location after install: <prefix>/include/ | ||||
|  | ||||
| @ -29,7 +29,7 @@ fi | ||||
|  | ||||
| prefix=@CMAKE_INSTALL_PREFIX@ | ||||
| exec_prefix=${prefix} | ||||
| libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ | ||||
| libdir=@onig_pkgconfig_libdir@ | ||||
| includedir=${prefix}/include | ||||
| is_set_exec_prefix=no | ||||
|  | ||||
|  | ||||
| @ -1,6 +1,6 @@ | ||||
| prefix=@CMAKE_INSTALL_PREFIX@ | ||||
| exec_prefix=${prefix} | ||||
| libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ | ||||
| libdir=@onig_pkgconfig_libdir@ | ||||
| includedir=${prefix}/include | ||||
| datarootdir=${prefix}/share | ||||
| datadir=${prefix}/share | ||||
|  | ||||
		Reference in New Issue
	
	Block a user
	 K.Kosako
					K.Kosako