Commit 62e79cb8 authored by Matt Pharr's avatar Matt Pharr

Fix Windows build

parent b57b56ca
......@@ -120,6 +120,7 @@ IF(WIN32)
SET(ZLIB_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src/ext/zlib")
SET(ZLIB_LIBRARY "${CMAKE_CURRENT_BINARY_DIR}/src/ext/zlib/$<CONFIGURATION>/zlibstatic.lib")
SET(ZLIB_LIBRARIES zlibstatic)
SET_PROPERTY(TARGET zlibstatic PROPERTY FOLDER "dependencies")
INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR} "${CMAKE_CURRENT_BINARY_DIR}/src/ext/zlib")
ENDIF()
......@@ -138,9 +139,8 @@ INCLUDE_DIRECTORIES (
${CMAKE_BINARY_DIR}/src/ext/openexr/IlmBase/config
${CMAKE_BINARY_DIR}/src/ext/openexr/OpenEXR/config
)
IF(WIN32)
SET(OPENEXR_LIBS IlmImf Imath Half zlibstatic)
SET(OPENEXR_LIBS IlmImf Imath Half ${ZLIB_LIBRARIES})
ELSE()
SET(OPENEXR_LIBS IlmImf Imath Half)
ENDIF()
......@@ -155,6 +155,9 @@ INCLUDE_DIRECTORIES (
)
SET(CMAKE_MACOSX_RPATH 1)
IF ( WIN32 )
ADD_DEFINITIONS ( /D PTEX_STATIC)
ENDIF ()
ADD_SUBDIRECTORY(src/ext/ptex)
SET_PROPERTY(TARGET Ptex_static PROPERTY FOLDER "dependencies")
INCLUDE_DIRECTORIES (
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment