Replace the deprecated $<CONFIGURATION> with $<CONFIG>
This commit is contained in:
parent
f38e35ebc3
commit
0a3e4c12ac
|
@ -566,7 +566,7 @@ if (HB_HAVE_INTROSPECTION)
|
||||||
# We need to account for the varying output directories
|
# We need to account for the varying output directories
|
||||||
# when we build using Visual Studio projects
|
# when we build using Visual Studio projects
|
||||||
if ("${CMAKE_GENERATOR}" MATCHES "Visual Studio*")
|
if ("${CMAKE_GENERATOR}" MATCHES "Visual Studio*")
|
||||||
set (hb_libpath "${CMAKE_CURRENT_BINARY_DIR}/$<CONFIGURATION>")
|
set (hb_libpath "${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>")
|
||||||
else ()
|
else ()
|
||||||
set (hb_libpath "$<TARGET_FILE_DIR:harfbuzz-gobject>")
|
set (hb_libpath "$<TARGET_FILE_DIR:harfbuzz-gobject>")
|
||||||
endif ()
|
endif ()
|
||||||
|
@ -816,7 +816,7 @@ if (NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL)
|
||||||
make_pkgconfig_pc_file("harfbuzz-gobject")
|
make_pkgconfig_pc_file("harfbuzz-gobject")
|
||||||
if (HB_HAVE_INTROSPECTION)
|
if (HB_HAVE_INTROSPECTION)
|
||||||
if ("${CMAKE_GENERATOR}" MATCHES "Visual Studio*")
|
if ("${CMAKE_GENERATOR}" MATCHES "Visual Studio*")
|
||||||
set (hb_libpath "${CMAKE_CURRENT_BINARY_DIR}/$<CONFIGURATION>")
|
set (hb_libpath "${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>")
|
||||||
else ()
|
else ()
|
||||||
set (hb_libpath "$<TARGET_FILE_DIR:harfbuzz-gobject>")
|
set (hb_libpath "$<TARGET_FILE_DIR:harfbuzz-gobject>")
|
||||||
endif ()
|
endif ()
|
||||||
|
|
Loading…
Reference in New Issue