Make Ninja generator happy with BUILD_BYPRODUCTS.

MariaDB · Apr 27, 2017 · f344d7e · f344d7e
1 parent 7228b99
commit f344d7e
Showing 1 changed file with 13 additions and 4 deletions.
diff --git a/extra/mariabackup/CMakeLists.txt b/extra/mariabackup/CMakeLists.txt
@@ -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 )