diff options
| author | Victor Romero <romerosanchezv@gmail.com> | 2019-04-30 16:54:33 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-30 16:54:33 -0700 |
| commit | e03ee9cacefd69a023ee9748768176a08d6216fd (patch) | |
| tree | 976279b8dd62a6024e71edd97f7c764124be8696 /ports/jxrlib | |
| parent | 9db65c78914407b952f520e9cd09a7c2e27e4a96 (diff) | |
| download | vcpkg-e03ee9cacefd69a023ee9748768176a08d6216fd.tar.gz vcpkg-e03ee9cacefd69a023ee9748768176a08d6216fd.zip | |
[ceres,jxrlib,zziplib] Fixes for non-windows (#6188)
* [ceres, zziplib] fixes for building on non-windows systems
* [jxrlib, zziplib] other fixes for non-windows systems
* [zziplib] fix CMakeLists.txt for non win32 platforms, there were missing exported headers
* [ceres] Fix targets path
* [ceres] Fix typo
* [ceres] trigger CI build
* [ceres] use proper glog/gflags targets
Diffstat (limited to 'ports/jxrlib')
| -rw-r--r-- | ports/jxrlib/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | ports/jxrlib/portfile.cmake | 8 |
2 files changed, 11 insertions, 5 deletions
diff --git a/ports/jxrlib/CMakeLists.txt b/ports/jxrlib/CMakeLists.txt index 17f16bea4..727b96906 100644 --- a/ports/jxrlib/CMakeLists.txt +++ b/ports/jxrlib/CMakeLists.txt @@ -1,6 +1,6 @@ # Copyright Mathieu Malaterre <malat@debian.org> # BSD (Same as jxrlib) -# Based on https://jxrlib.codeplex.com/discussions/440294 +# Based on https://jxrlib.codeplex.com/discussions/440294 # and modified for vcpkg packaging cmake_minimum_required(VERSION 2.8) project(jxrlib C) @@ -18,6 +18,10 @@ macro(JXR_MAKE_OBJ SET_NAME) endforeach() endmacro() +if(NOT MSVC) + add_definitions(-D__ANSI__) +endif() + include(TestBigEndian) test_big_endian(ISBIGENDIAN) if(ISBIGENDIAN) @@ -99,4 +103,4 @@ install(FILES jxrgluelib/JXRGlue.h jxrgluelib/JXRMeta.h jxrtestlib/JXRTest.h ) install(DIRECTORY common/include/ DESTINATION ${JXRLIB_INSTALL_INCLUDE_DIR} FILES_MATCHING PATTERN "*.h" -)
\ No newline at end of file +) diff --git a/ports/jxrlib/portfile.cmake b/ports/jxrlib/portfile.cmake index 9b7cca5fb..01780c78e 100644 --- a/ports/jxrlib/portfile.cmake +++ b/ports/jxrlib/portfile.cmake @@ -11,9 +11,11 @@ vcpkg_from_github( file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) -# The file guiddef.h is part of the Windows SDK, -# we then remove the local copy shipped with jxrlib -file(REMOVE ${SOURCE_PATH}/common/include/guiddef.h) +if(NOT VCPKG_CMAKE_SYSTEM_NAME MATCHES Darwin AND NOT VCPKG_CMAKE_SYSTEM_NAME MATCHES Linux) + # The file guiddef.h is part of the Windows SDK, + # we then remove the local copy shipped with jxrlib + file(REMOVE ${SOURCE_PATH}/common/include/guiddef.h) +endif() vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} |