Skip to content

Commit 3153546

Browse files
committed
fix: windows xml compilation error
1 parent 8339c91 commit 3153546

File tree

2 files changed

+39
-11
lines changed

2 files changed

+39
-11
lines changed

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,8 @@ if (MSVC)
141141
target_link_libraries(libFBX2glTF
142142
${FRAMEWORKS}
143143
draco::draco
144-
optimized ${FBXSDK_LIBRARY}
145-
debug ${FBXSDK_LIBRARY_DEBUG}
144+
optimized ${FBXSDK_LIBRARY} ${FBXSDK_LIBXML2_LIBRARY} ${FBXSDK_ZLIB_LIBRARY} ${FBXSDK_ALEMBIC_LIBRARY}
145+
debug ${FBXSDK_LIBRARY_DEBUG} ${FBXSDK_LIBXML2_LIBRARY_DEBUG} ${FBXSDK_ZLIB_LIBRARY_DEBUG} ${FBXSDK_ALEMBIC_LIBRARY_DEBUG}
146146
fmt::fmt-header-only
147147
${CMAKE_DL_LIBS}
148148
${CMAKE_THREAD_LIBS_INIT}

FindFBX.cmake

Lines changed: 37 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -85,21 +85,50 @@ find_path(FBXSDK_INCLUDE_DIR "fbxsdk.h"
8585
PATH_SUFFIXES "include")
8686
message("FBXSDK_INCLUDE_DIR: ${FBXSDK_INCLUDE_DIR}")
8787

88-
message("FBXSDK_LIBRARY: ${FBXSDK_ROOT}/${_fbxsdk_libdir_release}/${_fbxsdk_libname_release}")
8988
if (MSVC)
90-
find_library(FBXSDK_LIBRARY
91-
NAMES ${_fbxsdk_libname_release} ${_fbxsdk_alembic_libname_release} ${_fbxsdk_libxml2_libname_release} ${_fbxsdk_zlib_libname_release}
89+
# libalembic-md.lib
90+
find_library(FBXSDK_ALEMBIC_LIBRARY
91+
${_fbxsdk_alembic_libname_release} ${_fbxsdk_libxml2_libname_release} ${_fbxsdk_zlib_libname_release}
9292
NO_CMAKE_FIND_ROOT_PATH
9393
PATHS "${FBXSDK_ROOT}/${_fbxsdk_libdir_release}")
94-
message("FBXSDK_LIBRARY: ${FBXSDK_LIBRARY}")
94+
message("FBXSDK_ALEMBIC_LIBRARY: ${FBXSDK_LIBRARY}")
9595

96-
message("FBXSDK_LIBRARY_DEBUG: ${FBXSDK_ROOT}/${_fbxsdk_libdir_debug}/${_fbxsdk_libname_debug}")
97-
find_library(FBXSDK_LIBRARY_DEBUG
96+
# libalembic.lib debug
97+
find_library(FBXSDK_ALEMBIC_LIBRARY_DEBUG
9898
NAMES ${_fbxsdk_libname_debug} ${_fbxsdk_alembic_libname_debug} ${_fbxsdk_libxml2_libname_debug} ${_fbxsdk_zlib_libname_debug}
9999
NO_CMAKE_FIND_ROOT_PATH
100100
PATHS "${FBXSDK_ROOT}/${_fbxsdk_libdir_debug}")
101-
message("FBXSDK_LIBRARY_DEBUG: ${FBXSDK_LIBRARY_DEBUG}")
102-
else()
101+
message("FBXSDK_ALEMBIC_LIBRARY_DEBUG: ${FBXSDK_LIBRARY_DEBUG}")
102+
103+
# libxml2-md.lib
104+
find_library(FBXSDK_LIBXML2_LIBRARY
105+
${_fbxsdk_alembic_libname_release} ${_fbxsdk_libxml2_libname_release} ${_fbxsdk_zlib_libname_release}
106+
NO_CMAKE_FIND_ROOT_PATH
107+
PATHS "${FBXSDK_ROOT}/${_fbxsdk_libdir_release}")
108+
message("FBXSDK_LIBXML2_LIBRARY: ${FBXSDK_LIBRARY}")
109+
110+
# libxml2-md.lib debug
111+
find_library(FBXSDK_LIBXML2_LIBRARY_DEBUG
112+
NAMES ${_fbxsdk_libname_debug} ${_fbxsdk_alembic_libname_debug} ${_fbxsdk_libxml2_libname_debug} ${_fbxsdk_zlib_libname_debug}
113+
NO_CMAKE_FIND_ROOT_PATH
114+
PATHS "${FBXSDK_ROOT}/${_fbxsdk_libdir_debug}")
115+
message("FBXSDK_LIBXML2_LIBRARY_DEBUG: ${FBXSDK_LIBRARY_DEBUG}")
116+
117+
# zlib-md.lib
118+
find_library(FBXSDK_ZLIB_LIBRARY
119+
${_fbxsdk_alembic_libname_release} ${_fbxsdk_libxml2_libname_release} ${_fbxsdk_zlib_libname_release}
120+
NO_CMAKE_FIND_ROOT_PATH
121+
PATHS "${FBXSDK_ROOT}/${_fbxsdk_libdir_release}")
122+
message("FBXSDK_ZLIB_LIBRARY: ${FBXSDK_LIBRARY}")
123+
124+
# zlib-md.lib debug
125+
find_library(FBXSDK_ZLIB_LIBRARY_DEBUG
126+
NAMES ${_fbxsdk_libname_debug} ${_fbxsdk_alembic_libname_debug} ${_fbxsdk_libxml2_libname_debug} ${_fbxsdk_zlib_libname_debug}
127+
NO_CMAKE_FIND_ROOT_PATH
128+
PATHS "${FBXSDK_ROOT}/${_fbxsdk_libdir_debug}")
129+
message("FBXSDK_ZLIB_LIBRARY_DEBUG: ${FBXSDK_LIBRARY_DEBUG}")
130+
endif()
131+
103132
find_library(FBXSDK_LIBRARY ${_fbxsdk_libname_release}
104133
NO_CMAKE_FIND_ROOT_PATH
105134
PATHS "${FBXSDK_ROOT}/${_fbxsdk_libdir_release}")
@@ -110,7 +139,6 @@ find_library(FBXSDK_LIBRARY_DEBUG ${_fbxsdk_libname_debug}
110139
NO_CMAKE_FIND_ROOT_PATH
111140
PATHS "${FBXSDK_ROOT}/${_fbxsdk_libdir_debug}")
112141
message("FBXSDK_LIBRARY_DEBUG: ${FBXSDK_LIBRARY_DEBUG}")
113-
endif()
114142

115143
if (FBXSDK_INCLUDE_DIR AND FBXSDK_LIBRARY AND FBXSDK_LIBRARY_DEBUG)
116144
set(FBXSDK_FOUND YES)

0 commit comments

Comments
 (0)