diff options
| author | Brad King <brad.king@kitware.com> | 2017-10-30 12:58:57 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-10-30 12:59:00 (GMT) |
| commit | ccf1155977e5bf51c64c3ae34d9603a389da278b (patch) | |
| tree | 1b0c782a75a70df099f7a490006936bfd19bc5e8 /Modules | |
| parent | 9bfc43a5e5f82f9477ea761cc739fa289e3b92e2 (diff) | |
| parent | 3d42c3eda2ed65e1b510d76f28330b42263edffa (diff) | |
| download | CMake-ccf1155977e5bf51c64c3ae34d9603a389da278b.zip CMake-ccf1155977e5bf51c64c3ae34d9603a389da278b.tar.gz CMake-ccf1155977e5bf51c64c3ae34d9603a389da278b.tar.bz2 | |
Merge topic 'freetype-windows'
3d42c3ed FindFreetype: Normalize slashes when legacy FREETYPE_LIBRARY is specified
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1416
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindFreetype.cmake | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Modules/FindFreetype.cmake b/Modules/FindFreetype.cmake index 0e6d336..2acb4bc 100644 --- a/Modules/FindFreetype.cmake +++ b/Modules/FindFreetype.cmake @@ -115,6 +115,9 @@ if(NOT FREETYPE_LIBRARY) ) include(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations.cmake) select_library_configurations(FREETYPE) +else() + # on Windows, ensure paths are in canonical format (forward slahes): + file(TO_CMAKE_PATH "${FREETYPE_LIBRARY}" FREETYPE_LIBRARY) endif() unset(FREETYPE_FIND_ARGS) |