From 5823b05feb29a59510c32a9c28ca18b50b9b6399 Mon Sep 17 00:00:00 2001 From: manuel Date: Sun, 1 May 2016 18:06:14 +0200 Subject: sync with upstream --- project/cmake/modules/FindCpluff.cmake | 7 +++---- project/cmake/modules/FindCrossGUID.cmake | 6 ++---- project/cmake/modules/FindD3DX11Effects.cmake | 4 ++-- project/cmake/modules/FindFFMPEG.cmake | 5 ++--- project/cmake/modules/FindMySqlClient.cmake | 8 ++++---- project/cmake/modules/FindPCRE.cmake | 4 ---- project/cmake/modules/FindTagLib.cmake | 4 +--- project/cmake/modules/FindTinyXML.cmake | 6 +++--- 8 files changed, 17 insertions(+), 27 deletions(-) (limited to 'project/cmake/modules') diff --git a/project/cmake/modules/FindCpluff.cmake b/project/cmake/modules/FindCpluff.cmake index b8fa22d..c6693fa 100644 --- a/project/cmake/modules/FindCpluff.cmake +++ b/project/cmake/modules/FindCpluff.cmake @@ -11,6 +11,7 @@ if(NOT WIN32) get_filename_component(expat_dir ${EXPAT_LIBRARY} PATH) 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 @@ -34,11 +35,9 @@ else() CONFIGURE_COMMAND "" # TODO: Building the project directly from lib/cpluff/libcpluff/win32/cpluff.vcxproj # fails becaue it imports XBMC.defaults.props - BUILD_COMMAND devenv /build ${CORE_BUILD_CONFIG} - ${CORE_SOURCE_DIR}/project/VS2010Express/XBMC\ for\ Windows.sln - /project cpluff + BUILD_COMMAND msbuild ${CORE_SOURCE_DIR}/project/VS2010Express/XBMC\ for\ Windows.sln + /t:cpluff /p:Configuration=${CORE_BUILD_CONFIG} INSTALL_COMMAND "") - # TODO: core_link_library endif() set(CPLUFF_INCLUDE_DIRS ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/cpluff/include) diff --git a/project/cmake/modules/FindCrossGUID.cmake b/project/cmake/modules/FindCrossGUID.cmake index 0d4a915..df40c9e 100644 --- a/project/cmake/modules/FindCrossGUID.cmake +++ b/project/cmake/modules/FindCrossGUID.cmake @@ -30,10 +30,8 @@ if(ENABLE_INTERNAL_CROSSGUID) else() find_path(CROSSGUID_INCLUDE_DIR guid.h) - find_library(CROSSGUID_LIBRARY_RELEASE NAMES crossguid - ${CONFIGURATION_LIBDIR_RELEASE}) - find_library(CROSSGUID_LIBRARY_DEBUG NAMES crossguidd - ${CONFIGURATION_LIBDIR_DEBUG}) + find_library(CROSSGUID_LIBRARY_RELEASE NAMES crossguid) + find_library(CROSSGUID_LIBRARY_DEBUG NAMES crossguidd) include(SelectLibraryConfigurations) select_library_configurations(CROSSGUID) diff --git a/project/cmake/modules/FindD3DX11Effects.cmake b/project/cmake/modules/FindD3DX11Effects.cmake index 2b2de85..9de8c2b 100644 --- a/project/cmake/modules/FindD3DX11Effects.cmake +++ b/project/cmake/modules/FindD3DX11Effects.cmake @@ -10,8 +10,8 @@ ExternalProject_Add(d3dx11effects SOURCE_DIR ${CORE_SOURCE_DIR}/lib/win32/Effects11 PREFIX ${CORE_BUILD_DIR}/Effects11 CONFIGURE_COMMAND "" - BUILD_COMMAND devenv /build ${CORE_BUILD_CONFIG} - ${CORE_SOURCE_DIR}/lib/win32/Effects11/Effects11_2013.sln + BUILD_COMMAND msbuild ${CORE_SOURCE_DIR}/lib/win32/Effects11/Effects11_2013.sln + /t:Effects11 /p:Configuration=${CORE_BUILD_CONFIG} INSTALL_COMMAND "") set(D3DX11EFFECTS_FOUND 1) diff --git a/project/cmake/modules/FindFFMPEG.cmake b/project/cmake/modules/FindFFMPEG.cmake index 711845a..7f8e37f 100644 --- a/project/cmake/modules/FindFFMPEG.cmake +++ b/project/cmake/modules/FindFFMPEG.cmake @@ -31,7 +31,7 @@ if(ENABLE_INTERNAL_FFMPEG) URL ${FFMPEG_BASE_URL}/${FFMPEG_VER}.tar.gz PREFIX ${CORE_BUILD_DIR}/ffmpeg CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR} - -DCMAKE_BUILD_TYPE=${DCMAKE_BUILD_TYPE} + -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DFFMPEG_VER=${FFMPEG_VER} -DCORE_SYSTEM_NAME=${CORE_SYSTEM_NAME} ${CROSS_ARGS} @@ -54,8 +54,7 @@ then swresample=`PKG_CONFIG_PATH=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/lib/pkgconfig ${PKG_CONFIG_EXECUTABLE} --libs --static libswresample` gnutls=`PKG_CONFIG_PATH=${DEPENDS_PATH}/lib/pkgconfig/ ${PKG_CONFIG_EXECUTABLE} --libs-only-l --static --silence-errors gnutls` vorbisenc=`PKG_CONFIG_PATH=${DEPENDS_PATH}/lib/pkgconfig/ ${PKG_CONFIG_EXECUTABLE} --libs-only-l --static --silence-errors vorbisenc` - dcadec=`PKG_CONFIG_PATH=${DEPENDS_PATH}/lib/pkgconfig/ ${PKG_CONFIG_EXECUTABLE} --libs-only-l --static --silence-errors dcadec` - $@ $avcodec $avformat $avcodec $avfilter $swscale $swresample -lpostproc $gnutls $vorbisenc $dcadec + $@ $avcodec $avformat $avcodec $avfilter $swscale $swresample -lpostproc $gnutls $vorbisenc else $@ fi") diff --git a/project/cmake/modules/FindMySqlClient.cmake b/project/cmake/modules/FindMySqlClient.cmake index 12fee5c..2295c81 100644 --- a/project/cmake/modules/FindMySqlClient.cmake +++ b/project/cmake/modules/FindMySqlClient.cmake @@ -15,10 +15,10 @@ # MySqlClient::MySqlClient - The MySqlClient library find_path(MYSQLCLIENT_INCLUDE_DIR mysql/mysql_time.h) -find_library(MYSQLCLIENT_LIBRARY_RELEASE NAMES mysqlclient mysqlclient_r - PATH_SUFFIXES ${CONFIGURATION_LIBDIR_RELEASE} mysql) -find_library(MYSQLCLIENT_LIBRARY_DEBUG NAMES mysqlclient - PATH_SUFFIXES ${CONFIGURATION_LIBDIR_DEBUG} mysql) +find_library(MYSQLCLIENT_LIBRARY_RELEASE NAMES mysqlclient libmysql + PATH_SUFFIXES mysql) +find_library(MYSQLCLIENT_LIBRARY_DEBUG NAMES mysqlclient libmysql + PATH_SUFFIXES mysql) include(SelectLibraryConfigurations) select_library_configurations(MYSQLCLIENT) diff --git a/project/cmake/modules/FindPCRE.cmake b/project/cmake/modules/FindPCRE.cmake index 54c4ab4..8babed3 100644 --- a/project/cmake/modules/FindPCRE.cmake +++ b/project/cmake/modules/FindPCRE.cmake @@ -22,16 +22,12 @@ endif() find_path(PCRE_INCLUDE_DIR pcrecpp.h PATHS ${PC_PCRE_INCLUDEDIR}) find_library(PCRECPP_LIBRARY_RELEASE NAMES pcrecpp - PATH_SUFFIXES ${CONFIGURATION_LIBDIR_RELEASE} PATHS ${PC_PCRE_LIBDIR}) find_library(PCRE_LIBRARY_RELEASE NAMES pcre - PATH_SUFFIXES ${CONFIGURATION_LIBDIR_RELEASE} PATHS ${PC_PCRE_LIBDIR}) find_library(PCRECPP_LIBRARY_DEBUG NAMES pcrecppd - PATH_SUFFIXES ${CONFIGURATION_LIBDIR_DEBUG} PATHS ${PC_PCRE_LIBDIR}) find_library(PCRE_LIBRARY_DEBUG NAMES pcred - PATH_SUFFIXES ${CONFIGURATION_LIBDIR_DEBUG} PATHS ${PC_PCRE_LIBDIR}) set(PCRE_VERSION ${PC_PCRE_VERSION}) diff --git a/project/cmake/modules/FindTagLib.cmake b/project/cmake/modules/FindTagLib.cmake index b515e81..06b615d 100644 --- a/project/cmake/modules/FindTagLib.cmake +++ b/project/cmake/modules/FindTagLib.cmake @@ -20,10 +20,8 @@ endif() find_path(TAGLIB_INCLUDE_DIR taglib/tag.h PATHS ${PC_TAGLIB_INCLUDEDIR}) find_library(TAGLIB_LIBRARY_RELEASE NAMES tag - PATH_SUFFIXES ${CONFIGURATION_LIBDIR_RELEASE} PATHS ${PC_TAGLIB_LIBDIR}) -find_library(TAGLIB_LIBRARY_DEBUG NAMES tag - PATH_SUFFIXES ${CONFIGURATION_LIBDIR_DEBUG} +find_library(TAGLIB_LIBRARY_DEBUG NAMES tagd PATHS ${PC_TAGLIB_LIBDIR}) set(TAGLIB_VERSION ${PC_TAGLIB_VERSION}) diff --git a/project/cmake/modules/FindTinyXML.cmake b/project/cmake/modules/FindTinyXML.cmake index 0168f40..54ec946 100644 --- a/project/cmake/modules/FindTinyXML.cmake +++ b/project/cmake/modules/FindTinyXML.cmake @@ -22,10 +22,10 @@ find_path(TINYXML_INCLUDE_DIR tinyxml.h PATH_SUFFIXES tinyxml PATHS ${PC_TINYXML_INCLUDEDIR}) find_library(TINYXML_LIBRARY_RELEASE NAMES tinyxml tinyxmlSTL - PATH_SUFFIXES tinyxml ${CONFIGURATION_LIBDIR_RELEASE} + PATH_SUFFIXES tinyxml PATHS ${PC_TINYXML_LIBDIR}) -find_library(TINYXML_LIBRARY_DEBUG NAMES tinyxml tinyxmlSTL - PATH_SUFFIXES tinyxml ${CONFIGURATION_LIBDIR_DEBUG} +find_library(TINYXML_LIBRARY_DEBUG NAMES tinyxmld tinyxmlSTLd + PATH_SUFFIXES tinyxml PATHS ${PC_TINYXML_LIBDIR}) set(TINYXML_VERSION ${PC_TINYXML_VERSION}) -- cgit v1.2.3