Commit 95ff7f73 authored by Jacob Becker's avatar Jacob Becker

apply windows patch and delete patches

parent 03dba1a5
diff --git a/v3p/openjpeg2/CMakeLists.txt b/v3p/openjpeg2/CMakeLists.txt
index 0d8676d..058f849 100644
--- a/v3p/openjpeg2/CMakeLists.txt
+++ b/v3p/openjpeg2/CMakeLists.txt
@@ -36,6 +36,11 @@ SET(OPENJPEG2_SRCS
)
ADD_DEFINITIONS( ${OPENJPEG2_DEFINITIONS} )
+#set WIN32 defintion to fix compilation issue with ninja + msvc toolchain
+IF(WIN32)
+ ADD_DEFINITIONS("-DWIN32")
+ENDIF(WIN32)
+
# Pass proper definition to preprocessor to generate shared lib
ADD_LIBRARY(openjpeg2 ${OPENJPEG2_SRCS})
SET_TARGET_PROPERTIES(openjpeg2 PROPERTIES
include("${CMAKE_CURRENT_LIST_DIR}/../vxl.cmake")
superbuild_apply_patch(vxl openjpeg2-fix-msvc
"Fix OpenJPEG's detection of MSVC for non-VS generators")
......@@ -30,8 +30,8 @@ superbuild_set_revision(cmbworkflows
GIT_TAG origin/master)
superbuild_set_revision(vxl
URL "https://github.com/judajake/vxl/archive/da28c93.zip"
URL_MD5 04187d3839c5eef9cad388a1ad9aa22c)
URL "https://github.com/judajake/vxl/archive/44433e4.zip"
URL_MD5 f888f4527f0c3b2deeb3b270bf022155)
# Use the tweaked cmake build of zeromq
superbuild_set_revision(zeromq
......
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