aboutsummaryrefslogtreecommitdiff
path: root/ports/jxrlib
diff options
context:
space:
mode:
authorAlexander Kaspar <alexander.kaspar@gmail.com>2016-12-05 09:13:22 +0100
committerAlexander Kaspar <alexander.kaspar@gmail.com>2016-12-05 09:13:22 +0100
commita985fc2de8192fb159c8f90ca08fd513b09b8b3a (patch)
tree69f26c354e387750da929a87ec9c1a124b17fe9d /ports/jxrlib
parentc5b6f019bde3ab43b6a4f7e7e5477d5209af7e1f (diff)
parenta710f67e5281480ab22d0ef372d376696f5fc8ab (diff)
downloadvcpkg-a985fc2de8192fb159c8f90ca08fd513b09b8b3a.tar.gz
vcpkg-a985fc2de8192fb159c8f90ca08fd513b09b8b3a.zip
Merge branch 'master' into qca
Diffstat (limited to 'ports/jxrlib')
-rw-r--r--ports/jxrlib/CMakeLists.txt4
-rw-r--r--ports/jxrlib/CONTROL2
2 files changed, 3 insertions, 3 deletions
diff --git a/ports/jxrlib/CMakeLists.txt b/ports/jxrlib/CMakeLists.txt
index d9ac84fb6..17f16bea4 100644
--- a/ports/jxrlib/CMakeLists.txt
+++ b/ports/jxrlib/CMakeLists.txt
@@ -62,7 +62,7 @@ JXR_MAKE_OBJ(ENC)
add_library(jpegxr ${OBJ_ENC} ${OBJ_DEC} ${OBJ_SYS})
set_property(TARGET jpegxr
- PROPERTY COMPILE_DEFINITIONS __ANSI__ DISABLE_PERF_MEASUREMENT ${DEF_ENDIAN}
+ PROPERTY COMPILE_DEFINITIONS DISABLE_PERF_MEASUREMENT ${DEF_ENDIAN}
)
set_property(TARGET jpegxr PROPERTY LINK_INTERFACE_LIBRARIES "")
install(TARGETS jpegxr
@@ -80,7 +80,7 @@ JXR_MAKE_OBJ(TEST)
add_library(jxrglue ${OBJ_GLUE} ${OBJ_TEST})
set_property(TARGET jxrglue
- PROPERTY COMPILE_DEFINITIONS __ANSI__ DISABLE_PERF_MEASUREMENT ${DEF_ENDIAN}
+ PROPERTY COMPILE_DEFINITIONS DISABLE_PERF_MEASUREMENT ${DEF_ENDIAN}
)
set_property(TARGET jxrglue PROPERTY LINK_INTERFACE_LIBRARIES "")
install(TARGETS jxrglue
diff --git a/ports/jxrlib/CONTROL b/ports/jxrlib/CONTROL
index 7c3d5d603..062850e06 100644
--- a/ports/jxrlib/CONTROL
+++ b/ports/jxrlib/CONTROL
@@ -1,3 +1,3 @@
Source: jxrlib
-Version: 1.1-1
+Version: 1.1-2
Description: Open source implementation of the jpegxr image format standard.