Skip to content

Commit 42f78b9

Browse files
committed
Some fixes for MinGW
1 parent 80932c0 commit 42f78b9

3 files changed

Lines changed: 5 additions & 5 deletions

File tree

cmake/dependency.de265.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ set_property(TARGET DE265 PROPERTY FOLDER "Dependencies")
3131

3232
set(LIBDE265_INCLUDE_DIRS ${INSTALL_DIR}/include)
3333
set(LIBDE265_LINK_DIRS ${INSTALL_DIR}/lib)
34-
if (WIN32)
34+
if (MSVC)
3535
set(LIBDE265_LIBRARY libde265)
3636
else()
3737
set(LIBDE265_LIBRARY de265)

cmake/dependency.kvazaar.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ set_property(TARGET KVAZAAR PROPERTY FOLDER "Dependencies")
3131

3232
set(KVAZAAR_INCLUDE_DIRS ${INSTALL_DIR}/include)
3333
set(KVAZAAR_LINK_DIRS ${INSTALL_DIR}/lib)
34-
if(WIN32)
34+
if(MSVC)
3535
set(KVAZAAR_LIBRARY libkvazaar)
3636
else()
3737
set(KVAZAAR_LIBRARY kvazaar)

cmake/dependency.png.cmake

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ ExternalProject_Get_Property(PNG INSTALL_DIR)
3636
add_library(LibPNG INTERFACE)
3737
add_dependencies(LibPNG PNG)
3838
target_link_directories(LibPNG INTERFACE ${INSTALL_DIR}/lib)
39-
if(UNIX)
40-
target_link_libraries(LibPNG INTERFACE libpng16${CMAKE_STATIC_LIBRARY_SUFFIX})
39+
if(MSVC)
40+
target_link_libraries(LibPNG INTERFACE libpng16_static.lib)
4141
else()
42-
target_link_libraries(LibPNG INTERFACE libpng16_static${CMAKE_STATIC_LIBRARY_SUFFIX})
42+
target_link_libraries(LibPNG INTERFACE png16)
4343
endif()
4444
target_include_directories(LibPNG INTERFACE ${INSTALL_DIR}/include)
4545
set_property(TARGET PNG PROPERTY FOLDER "Dependencies")

0 commit comments

Comments
 (0)