sync with upstream

1 files changed, 11 insertions, 22 deletions

diff --git a/cmake/modules/FindCpluff.cmake b/cmake/modules/FindCpluff.cmake
index 913d7ae..9e29e17 100644
--- a/cmake/modules/FindCpluff.cmake
+++ b/cmake/modules/FindCpluff.cmake
@@ -6,8 +6,11 @@
 #
 # and link Kodi against the cpluff libraries.
 
-if(NOT WIN32)
-  find_package(EXPAT REQUIRED)
+find_package(EXPAT REQUIRED)
+if(CORE_SYSTEM_NAME MATCHES windows)
+  add_subdirectory(${CMAKE_SOURCE_DIR}/lib/cpluff)
+  set(CPLUFF_LIBRARIES $<TARGET_FILE:libcpluff> ${EXPAT_LIBRARIES})
+else()
   string(REPLACE ";" " " defines "${CMAKE_C_FLAGS} ${SYSTEM_DEFINES} -I${EXPAT_INCLUDE_DIR}")
   get_filename_component(expat_dir ${EXPAT_LIBRARY} DIRECTORY)
   set(ldflags "-L${expat_dir}")
@@ -31,7 +34,8 @@ if(NOT WIN32)
                                         --host=${ARCH}
                                         CFLAGS=${defines}
                                         CPPFLAGS=${cppflags}
-                                        LDFLAGS=${ldflags})
+                                        LDFLAGS=${ldflags}
+                      BUILD_BYPRODUCTS <INSTALL_DIR>/lib/libcpluff.a)
   ExternalProject_Add_Step(libcpluff autoreconf
                                      DEPENDEES download update patch
                                      DEPENDERS configure
@@ -39,24 +43,9 @@ if(NOT WIN32)
                                      COMMAND PATH=${NATIVEPREFIX}/bin:$ENV{PATH} autoreconf -vif
                                      WORKING_DIRECTORY <SOURCE_DIR>)
 
-  set(ldflags "${ldflags};-lexpat")
-  core_link_library(${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/cpluff/lib/libcpluff.a
-                    system/libcpluff libcpluff extras "${ldflags}")
-  set(CPLUFF_INCLUDE_DIRS ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/cpluff/include)
-  set(CPLUFF_FOUND 1)
-  mark_as_advanced(CPLUFF_INCLUDE_DIRS CPLUFF_FOUND)
-else()
-  find_path(CPLUFF_INCLUDE_DIR cpluff.h)
-
-  include(FindPackageHandleStandardArgs)
-  find_package_handle_standard_args(Cpluff
-                                    REQUIRED_VARS CPLUFF_INCLUDE_DIR)
-
-  if(CPLUFF_FOUND)
-    set(CPLUFF_INCLUDE_DIRS ${CPLUFF_INCLUDE_DIR})
-  endif()
-  mark_as_advanced(CPLUFF_INCLUDE_DIRS CPLUFF_FOUND)
-
-  add_custom_target(libcpluff)
+  set(CPLUFF_LIBRARIES ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/cpluff/lib/libcpluff.a ${EXPAT_LIBRARIES})
 endif()
+set(CPLUFF_INCLUDE_DIRS ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/cpluff/include)
+set(CPLUFF_FOUND 1)
+mark_as_advanced(CPLUFF_INCLUDE_DIRS CPLUFF_LIBRARIES)
 set_target_properties(libcpluff PROPERTIES FOLDER "External Projects")