1 files changed, 26 insertions, 18 deletions

diff --git a/project/cmake/modules/FindCpluff.cmake b/project/cmake/modules/FindCpluff.cmake
index c6693fa..fb2bb25 100644
--- a/project/cmake/modules/FindCpluff.cmake
+++ b/project/cmake/modules/FindCpluff.cmake
@@ -8,38 +8,46 @@
 
 if(NOT WIN32)
   string(REPLACE ";" " " defines "${CMAKE_C_FLAGS} ${SYSTEM_DEFINES} -I${EXPAT_INCLUDE_DIR}")
-  get_filename_component(expat_dir ${EXPAT_LIBRARY} PATH)
+  get_filename_component(expat_dir ${EXPAT_LIBRARY} DIRECTORY)
   set(ldflags "-L${expat_dir}")
   ExternalProject_Add(libcpluff SOURCE_DIR ${CORE_SOURCE_DIR}/lib/cpluff
                       BUILD_IN_SOURCE 1
                       PREFIX ${CORE_BUILD_DIR}/cpluff
-                      PATCH_COMMAND rm -f config.status
-                      UPDATE_COMMAND PATH=${NATIVEPREFIX}/bin:$ENV{PATH} autoreconf -vif
                       CONFIGURE_COMMAND CC=${CMAKE_C_COMPILER} ${CORE_SOURCE_DIR}/lib/cpluff/configure
                                         --disable-nls
                                         --enable-static
                                         --disable-shared
                                         --with-pic
                                         --prefix=<INSTALL_DIR>
+                                        --libdir=<INSTALL_DIR>/lib
                                         --host=${ARCH}
                                         CFLAGS=${defines}
-                                        LDFLAGS=${ldflags}
-                      BUILD_COMMAND make V=1)
+                                        LDFLAGS=${ldflags})
+  ExternalProject_Add_Step(libcpluff autoreconf
+                                     DEPENDEES download update patch
+                                     DEPENDERS configure
+                                     COMMAND rm -f config.status
+                                     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(WRAP_FILES ${WRAP_FILES} PARENT_SCOPE)
+  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()
-  ExternalProject_Add(libcpluff SOURCE_DIR ${CORE_SOURCE_DIR}/lib/cpluff
-                      PREFIX ${CORE_BUILD_DIR}/cpluff
-                      CONFIGURE_COMMAND ""
-                      # TODO: Building the project directly from lib/cpluff/libcpluff/win32/cpluff.vcxproj
-                      #       fails becaue it imports XBMC.defaults.props
-                      BUILD_COMMAND msbuild ${CORE_SOURCE_DIR}/project/VS2010Express/XBMC\ for\ Windows.sln
-                                            /t:cpluff /p:Configuration=${CORE_BUILD_CONFIG}
-                      INSTALL_COMMAND "")
-endif()
+  find_path(CPLUFF_INCLUDE_DIR cpluff.h)
 
-set(CPLUFF_INCLUDE_DIRS ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/cpluff/include)
-set(CPLUFF_FOUND 1)
-mark_as_advanced(CPLUFF_INCLUDE_DIRS CPLUFF_FOUND)
+  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)
+endif()
+set_target_properties(libcpluff PROPERTIES FOLDER "External Projects")