Skip to content

Commit 473a12d

Browse files
committed
Fix Windows build
1 parent f79d180 commit 473a12d

1 file changed

Lines changed: 13 additions & 4 deletions

File tree

CMakeLists.txt

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ set(CMAKE_WARN_DEPRECATED FALSE CACHE BOOL "" FORCE)
1111
#tinygltf
1212
set(TINYGLTF_HEADER_ONLY ON CACHE INTERNAL "" FORCE)
1313
set(TINYGLTF_INSTALL OFF CACHE INTERNAL "" FORCE)
14+
set(TINYGLTF_BUILD_LOADER_EXAMPLE OFF CACHE INTERNAL "" FORCE)
1415

1516
CPMAddPackage(
1617
NAME tinygltf
@@ -27,7 +28,17 @@ CPMAddPackage(
2728
GITHUB_REPOSITORY "madler/zlib"
2829
)
2930

31+
# pass zlib information to libpng
32+
set(ZLIB_LIBRARIES zlibstatic)
33+
set(ZLIB_INCLUDE_DIRS ${zlib_SOURCE_DIR} ${zlib_BINARY_DIR})
34+
3035
# libpng
36+
set(PNG_TESTS OFF)
37+
set(PNG_EXECUTABLES OFF)
38+
set(PNG_SHARED OFF)
39+
set(PNG_FRAMEWORK OFF)
40+
set(PNG_BUILD_ZLIB ON)
41+
3142
CPMAddPackage(
3243
NAME libpng
3344
VERSION 1.6.40
@@ -51,12 +62,10 @@ set(SOURCE_FILES ${SOURCE_FILES} "src/main.cpp" "src/TIM.cpp" "src/Animation.cpp
5162
add_executable(DW1ModelConverter ${SOURCE_FILES})
5263

5364
set_target_properties(DW1ModelConverter PROPERTIES CXX_STANDARD 20)
54-
target_include_directories(DW1ModelConverter PRIVATE ${cimg_SOURCE_DIR})
65+
target_include_directories(DW1ModelConverter PRIVATE ${cimg_SOURCE_DIR} ${libpng_SOURCE_DIR} ${libpng_BINARY_DIR})
5566
target_link_libraries(DW1ModelConverter PRIVATE png_static tinygltf)
5667

5768
target_compile_definitions(DW1ModelConverter PRIVATE cimg_display=0)
5869
target_compile_definitions(DW1ModelConverter PRIVATE cimg_use_png)
5970

60-
message("${PROJECT_SOURCE_DIR}")
61-
62-
install(TARGETS DW1ModelConverter)# RUNTIME DESTINATION ${PROJECT_SOURCE_DIR}/install)
71+
install(TARGETS DW1ModelConverter)

0 commit comments

Comments
 (0)