third_party/exiv2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove some cmake old checks + newer gtest version

Browse Source
This commit is contained in:
Luis Díaz Más 2021-04-05 17:32:33 +02:00
parent 6b0e4a2e6d
commit cd5c8fba49
4 changed files with 4 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CMakeLists.txt
View File

@ -1,12 +1,7 @@
cmake_minimum_required( VERSION 3.3.2 )
cmake_minimum_required( VERSION 3.5.0 )
project(exiv2 # use TWEAK to categorize the build
VERSION 0.27.4.2 # 0.27.4 = GM (tagged and released)
# 0.27.4.9 = 27.4.9 Development
# 0.27.4.00 = GM Preview
# 0.27.4.2 = RC2 (tagged and released)
# 0.27.4.20 = RC2 Preview
# 0.27.4.29 = RC2 Development
VERSION 1.0.0.9
LANGUAGES CXX
)
include(cmake/mainSetup.cmake REQUIRED)

18
cmake/config.h.cmake
View File

@ -44,27 +44,12 @@
// Define if you have the <regex.h> header file.
#cmakedefine EXV_HAVE_REGEX_H
// Define if have the <memory.h> header file.
#cmakedefine EXV_HAVE_MEMORY_H
// Define if stdbool.h conforms to C99.
#cmakedefine EXV_HAVE_STDBOOL_H
// Define if you have the <strings.h> header file.
#cmakedefine EXV_HAVE_STRINGS_H
// Define if you have the mmap function.
#cmakedefine EXV_HAVE_MMAP
// Define if you have the munmap function.
#cmakedefine EXV_HAVE_MUNMAP
// Define if you have <sys/stat.h> header file.
#cmakedefine EXV_HAVE_SYS_STAT_H
// Define if you have the <sys/types.h> header file.
#cmakedefine EXV_HAVE_SYS_TYPES_H
/* Define if you have the <unistd.h> header file. */
#cmakedefine EXV_HAVE_UNISTD_H
@ -74,9 +59,6 @@
// Define if you have are using the zlib library.
#cmakedefine EXV_HAVE_LIBZ
// Define if you have the <process.h> header file.
#cmakedefine EXV_HAVE_PROCESS_H
/* Define if you have (Exiv2/xmpsdk) Adobe XMP Toolkit. */
#cmakedefine EXV_HAVE_XMP_TOOLKIT

7
cmake/generateConfigFile.cmake
View File

@ -38,13 +38,6 @@ int main() {
return 0;
}" EXV_STRERROR_R_CHAR_P )
check_include_file_cxx( "memory.h" EXV_HAVE_MEMORY_H )
check_include_file_cxx( "process.h" EXV_HAVE_PROCESS_H )
check_include_file_cxx( "stdbool.h" EXV_HAVE_STDBOOL_H )
check_include_file_cxx( "strings.h" EXV_HAVE_STRINGS_H )
check_include_file_cxx( "sys/stat.h" EXV_HAVE_SYS_STAT_H )
check_include_file_cxx( "sys/types.h" EXV_HAVE_SYS_TYPES_H )
check_include_file_cxx( "inttypes.h" EXV_HAVE_INTTYPES_H )
check_include_file_cxx( "unistd.h" EXV_HAVE_UNISTD_H )
check_include_file_cxx( "sys/mman.h" EXV_HAVE_SYS_MMAN_H )
if ( NOT MINGW AND NOT MSYS AND NOT MSVC )

7
conanfile.py
View File

@ -19,7 +19,7 @@ class Exiv2Conan(ConanFile):
def configure(self):
self.options['libcurl'].shared = False
self.options['libcurl'].with_openssl = True
self.options['gtest'].shared = True
self.options['gtest'].shared = False
def requirements(self):
self.requires('zlib/1.2.11@conan/stable')
@ -28,10 +28,7 @@ class Exiv2Conan(ConanFile):
self.requires('libiconv/1.15@bincrafters/stable')
if self.options.unitTests:
if self.settings.compiler == "Visual Studio" and Version(self.settings.compiler.version.value) <= "12":
self.requires('gtest/1.8.0@bincrafters/stable')
else:
self.requires('gtest/1.8.1@bincrafters/stable')
self.requires('gtest/1.8.1@bincrafters/stable')
if self.options.webready and not os_info.is_macos:
# Note: This difference in versions is just due to a combination of corner cases in the