Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
f344d7ec
Commit
f344d7ec
authored
Apr 18, 2017
by
Vladislav Vaintroub
Committed by
Sergei Golubchik
Apr 27, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make Ninja generator happy with BUILD_BYPRODUCTS.
parent
7228b998
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
4 deletions
+13
-4
extra/mariabackup/CMakeLists.txt
extra/mariabackup/CMakeLists.txt
+13
-4
No files found.
extra/mariabackup/CMakeLists.txt
View file @
f344d7ec
...
...
@@ -56,6 +56,7 @@ IF((NOT WITH_LIBARCHIVE STREQUAL "OFF") AND (NOT LibArchive_FOUND))
ELSE
()
# Build a local version
INCLUDE
(
ExternalProject
)
SET
(
LIBARCHIVE_DIR
${
CMAKE_CURRENT_BINARY_DIR
}
/libarchive
)
SET
(
libarchive_PREFIX
${
CMAKE_CURRENT_BINARY_DIR
}
/libarchive
)
SET
(
libarchive_CMAKE_ARGS
-DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
...
...
@@ -71,27 +72,35 @@ IF((NOT WITH_LIBARCHIVE STREQUAL "OFF") AND (NOT LibArchive_FOUND))
)
IF
(
WIN32
)
SET
(
libarchive_CMAKE_ARGS
${
libarchive_CMAKE_ARGS
}
-DWINDOWS_VERSION=WIN7 -DCMAKE_DEBUG_POSTFIX=d
)
SET
(
LIBARCHIVE_RELEASE_LIB
${
LIBARCHIVE_DIR
}
/lib/
${
CMAKE_STATIC_LIBRARY_PREFIX
}
archive_static
${
CMAKE_STATIC_LIBRARY_SUFFIX
}
)
SET
(
LIBARCHIVE_DEBUG_LIB
${
LIBARCHIVE_DIR
}
/lib/
${
CMAKE_STATIC_LIBRARY_PREFIX
}
archive_staticd
${
CMAKE_STATIC_LIBRARY_SUFFIX
}
)
SET
(
byproducts
${
LIBARCHIVE_RELEASE_LIB
}
${
LIBARCHIVE_DEBUG_LIB
}
)
ELSE
()
SET
(
LIBARCHIVE_LIB
${
LIBARCHIVE_DIR
}
/lib/
${
CMAKE_STATIC_LIBRARY_PREFIX
}
archive
${
CMAKE_STATIC_LIBRARY_SUFFIX
}
)
SET
(
byproducts
${
LIBARCHIVE_LIB
}
)
ENDIF
()
IF
(
CMAKE_VERSION VERSION_GREATER
"3.1"
)
SET
(
byproducts BUILD_BYPRODUCTS
${
byproducts
}
)
ENDIF
()
SET
(
LIBARCHIVE_DIR
${
CMAKE_CURRENT_BINARY_DIR
}
/libarchive
)
ExternalProject_Add
(
libarchive
PREFIX
${
libarchive_PREFIX
}
DOWNLOAD_DIR
${
LIBARCHIVE_DIR
}
URL http://www.libarchive.org/downloads/libarchive-3.2.2.tar.gz
INSTALL_DIR
${
LIBARCHIVE_DIR
}
CMAKE_ARGS
${
libarchive_CMAKE_ARGS
}
${
byproducts
}
)
ADD_LIBRARY
(
archive_static STATIC IMPORTED
)
ADD_DEPENDENCIES
(
archive_static libarchive
)
IF
(
WIN32
)
SET
(
LIBARCHIVE_RELEASE_LIB
${
LIBARCHIVE_DIR
}
/lib/
${
CMAKE_STATIC_LIBRARY_PREFIX
}
archive_static
${
CMAKE_STATIC_LIBRARY_SUFFIX
}
)
SET
(
LIBARCHIVE_DEBUG_LIB
${
LIBARCHIVE_DIR
}
/lib/
${
CMAKE_STATIC_LIBRARY_PREFIX
}
archive_staticd
${
CMAKE_STATIC_LIBRARY_SUFFIX
}
)
SET_PROPERTY
(
TARGET archive_static PROPERTY IMPORTED_LOCATION_RELWITHDEBINFO
${
LIBARCHIVE_RELEASE_LIB
}
)
SET_PROPERTY
(
TARGET archive_static PROPERTY IMPORTED_LOCATION_RELEASE
${
LIBARCHIVE_RELEASE_LIB
}
)
SET_PROPERTY
(
TARGET archive_static PROPERTY IMPORTED_LOCATION_DEBUG
${
LIBARCHIVE_DEBUG_LIB
}
)
SET_PROPERTY
(
TARGET archive_static PROPERTY IMPORTED_LOCATION_MINSIZEREL
${
LIBARCHIVE_RELEASE_LIB
}
)
ELSE
()
SET_PROPERTY
(
TARGET archive_static PROPERTY IMPORTED_LOCATION
${
LIBARCHIVE_
DIR
}
/lib/
${
CMAKE_STATIC_LIBRARY_PREFIX
}
archive
${
CMAKE_STATIC_LIBRARY_SUFFIX
}
)
SET_PROPERTY
(
TARGET archive_static PROPERTY IMPORTED_LOCATION
${
LIBARCHIVE_
LIB
}
)
ENDIF
()
SET
(
LibArchive_FOUND ON
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment