summaryrefslogtreecommitdiff
path: root/externals
diff options
context:
space:
mode:
Diffstat (limited to 'externals')
-rw-r--r--externals/CMakeLists.txt4
m---------externals/dynarmic0
-rw-r--r--externals/find-modules/FindLibzip.cmake72
-rw-r--r--externals/find-modules/Findlibzip.cmake72
4 files changed, 74 insertions, 74 deletions
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt
index c629bbc5c..851c282b4 100644
--- a/externals/CMakeLists.txt
+++ b/externals/CMakeLists.txt
@@ -64,8 +64,8 @@ endif()
64add_subdirectory(sirit) 64add_subdirectory(sirit)
65 65
66# libzip 66# libzip
67find_package(Libzip 1.5) 67find_package(libzip 1.5)
68if (NOT LIBZIP_FOUND) 68if (NOT libzip_FOUND)
69 message(STATUS "libzip 1.5 or newer not found, falling back to externals") 69 message(STATUS "libzip 1.5 or newer not found, falling back to externals")
70 add_subdirectory(libzip EXCLUDE_FROM_ALL) 70 add_subdirectory(libzip EXCLUDE_FROM_ALL)
71endif() 71endif()
diff --git a/externals/dynarmic b/externals/dynarmic
Subproject 646fd0592091c5c1e5899fa715bd7b7fcc977a3 Subproject c788bcdf17e6bc1d1a1dd315106b952013f5ecb
diff --git a/externals/find-modules/FindLibzip.cmake b/externals/find-modules/FindLibzip.cmake
deleted file mode 100644
index f36b1687a..000000000
--- a/externals/find-modules/FindLibzip.cmake
+++ /dev/null
@@ -1,72 +0,0 @@
1
2find_package(PkgConfig QUIET)
3pkg_check_modules(PC_LIBZIP QUIET libzip)
4
5find_path(LIBZIP_INCLUDE_DIR
6 NAMES zip.h
7 PATHS ${PC_LIBZIP_INCLUDE_DIRS}
8 "$ENV{LIB_DIR}/include"
9 "$ENV{INCLUDE}"
10 /usr/local/include
11 /usr/include
12)
13find_path(LIBZIP_INCLUDE_DIR_ZIPCONF
14 NAMES zipconf.h
15 HINTS ${PC_LIBZIP_INCLUDE_DIRS}
16 "$ENV{LIB_DIR}/include"
17 "$ENV{LIB_DIR}/lib/libzip/include"
18 "$ENV{LIB}/lib/libzip/include"
19 /usr/local/lib/libzip/include
20 /usr/lib/libzip/include
21 /usr/local/include
22 /usr/include
23 "$ENV{INCLUDE}"
24)
25find_library(LIBZIP_LIBRARY
26 NAMES zip
27 PATHS ${PC_LIBZIP_LIBRARY_DIRS}
28 "$ENV{LIB_DIR}/lib" "$ENV{LIB}" /usr/local/lib /usr/lib
29)
30
31if (LIBZIP_INCLUDE_DIR_ZIPCONF)
32 FILE(READ "${LIBZIP_INCLUDE_DIR_ZIPCONF}/zipconf.h" _LIBZIP_VERSION_CONTENTS)
33 if (_LIBZIP_VERSION_CONTENTS)
34 STRING(REGEX REPLACE ".*#define LIBZIP_VERSION \"([0-9.]+)\".*" "\\1" LIBZIP_VERSION "${_LIBZIP_VERSION_CONTENTS}")
35 endif()
36 unset(_LIBZIP_VERSION_CONTENTS)
37endif()
38
39set(LIBZIP_VERSION ${LIBZIP_VERSION} CACHE STRING "Version number of libzip")
40
41include(FindPackageHandleStandardArgs)
42find_package_handle_standard_args(Libzip
43 FOUND_VAR LIBZIP_FOUND
44 REQUIRED_VARS
45 LIBZIP_LIBRARY
46 LIBZIP_INCLUDE_DIR
47 LIBZIP_INCLUDE_DIR_ZIPCONF
48 LIBZIP_VERSION
49 VERSION_VAR LIBZIP_VERSION
50)
51
52if(LIBZIP_FOUND)
53 set(LIBZIP_LIBRARIES ${LIBZIP_LIBRARY})
54 set(LIBZIP_INCLUDE_DIRS ${LIBZIP_INCLUDE_DIR})
55 set(LIBZIP_DEFINITIONS ${PC_LIBZIP_CFLAGS_OTHER})
56endif()
57
58if(LIBZIP_FOUND AND NOT TARGET libzip::libzip)
59 add_library(libzip::libzip UNKNOWN IMPORTED)
60 set_target_properties(libzip::libzip PROPERTIES
61 IMPORTED_LOCATION "${LIBZIP_LIBRARY}"
62 INTERFACE_COMPILE_OPTIONS "${PC_LIBZIP_CFLAGS_OTHER}"
63 INTERFACE_INCLUDE_DIRECTORIES "${LIBZIP_INCLUDE_DIR}"
64 )
65endif()
66
67mark_as_advanced(
68 LIBZIP_INCLUDE_DIR
69 LIBZIP_INCLUDE_DIR_ZIPCONF
70 LIBZIP_LIBRARY
71 LIBZIP_VERSION
72)
diff --git a/externals/find-modules/Findlibzip.cmake b/externals/find-modules/Findlibzip.cmake
new file mode 100644
index 000000000..8934de3b8
--- /dev/null
+++ b/externals/find-modules/Findlibzip.cmake
@@ -0,0 +1,72 @@
1
2find_package(PkgConfig QUIET)
3pkg_check_modules(PC_libzip QUIET libzip)
4
5find_path(libzip_INCLUDE_DIR
6 NAMES zip.h
7 PATHS ${PC_libzip_INCLUDE_DIRS}
8 "$ENV{LIB_DIR}/include"
9 "$ENV{INCLUDE}"
10 /usr/local/include
11 /usr/include
12)
13find_path(libzip_INCLUDE_DIR_ZIPCONF
14 NAMES zipconf.h
15 HINTS ${PC_libzip_INCLUDE_DIRS}
16 "$ENV{LIB_DIR}/include"
17 "$ENV{LIB_DIR}/lib/libzip/include"
18 "$ENV{LIB}/lib/libzip/include"
19 /usr/local/lib/libzip/include
20 /usr/lib/libzip/include
21 /usr/local/include
22 /usr/include
23 "$ENV{INCLUDE}"
24)
25find_library(libzip_LIBRARY
26 NAMES zip
27 PATHS ${PC_libzip_LIBRARY_DIRS}
28 "$ENV{LIB_DIR}/lib" "$ENV{LIB}" /usr/local/lib /usr/lib
29)
30
31if (libzip_INCLUDE_DIR_ZIPCONF)
32 FILE(READ "${libzip_INCLUDE_DIR_ZIPCONF}/zipconf.h" _libzip_VERSION_CONTENTS)
33 if (_libzip_VERSION_CONTENTS)
34 STRING(REGEX REPLACE ".*#define LIBZIP_VERSION \"([0-9.]+)\".*" "\\1" libzip_VERSION "${_libzip_VERSION_CONTENTS}")
35 endif()
36 unset(_libzip_VERSION_CONTENTS)
37endif()
38
39set(libzip_VERSION ${libzip_VERSION} CACHE STRING "Version number of libzip")
40
41include(FindPackageHandleStandardArgs)
42find_package_handle_standard_args(libzip
43 FOUND_VAR libzip_FOUND
44 REQUIRED_VARS
45 libzip_LIBRARY
46 libzip_INCLUDE_DIR
47 libzip_INCLUDE_DIR_ZIPCONF
48 libzip_VERSION
49 VERSION_VAR libzip_VERSION
50)
51
52if(libzip_FOUND)
53 set(libzip_LIBRARIES ${libzip_LIBRARY})
54 set(libzip_INCLUDE_DIRS ${libzip_INCLUDE_DIR})
55 set(libzip_DEFINITIONS ${PC_libzip_CFLAGS_OTHER})
56endif()
57
58if(libzip_FOUND AND NOT TARGET libzip::libzip)
59 add_library(libzip::libzip UNKNOWN IMPORTED)
60 set_target_properties(libzip::libzip PROPERTIES
61 IMPORTED_LOCATION "${libzip_LIBRARY}"
62 INTERFACE_COMPILE_OPTIONS "${PC_libzip_CFLAGS_OTHER}"
63 INTERFACE_INCLUDE_DIRECTORIES "${libzip_INCLUDE_DIR}"
64 )
65endif()
66
67mark_as_advanced(
68 libzip_INCLUDE_DIR
69 libzip_INCLUDE_DIR_ZIPCONF
70 libzip_LIBRARY
71 libzip_VERSION
72)
HIC SVNT DRACONES