diff options
Diffstat (limited to 'project/cmake/modules/FindCpluff.cmake')
| -rw-r--r-- | project/cmake/modules/FindCpluff.cmake | 7 |
1 files changed, 3 insertions, 4 deletions
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) | |||
| 11 | get_filename_component(expat_dir ${EXPAT_LIBRARY} PATH) | 11 | get_filename_component(expat_dir ${EXPAT_LIBRARY} PATH) |
| 12 | set(ldflags "-L${expat_dir}") | 12 | set(ldflags "-L${expat_dir}") |
| 13 | ExternalProject_Add(libcpluff SOURCE_DIR ${CORE_SOURCE_DIR}/lib/cpluff | 13 | ExternalProject_Add(libcpluff SOURCE_DIR ${CORE_SOURCE_DIR}/lib/cpluff |
| 14 | BUILD_IN_SOURCE 1 | ||
| 14 | PREFIX ${CORE_BUILD_DIR}/cpluff | 15 | PREFIX ${CORE_BUILD_DIR}/cpluff |
| 15 | PATCH_COMMAND rm -f config.status | 16 | PATCH_COMMAND rm -f config.status |
| 16 | UPDATE_COMMAND PATH=${NATIVEPREFIX}/bin:$ENV{PATH} autoreconf -vif | 17 | UPDATE_COMMAND PATH=${NATIVEPREFIX}/bin:$ENV{PATH} autoreconf -vif |
| @@ -34,11 +35,9 @@ else() | |||
| 34 | CONFIGURE_COMMAND "" | 35 | CONFIGURE_COMMAND "" |
| 35 | # TODO: Building the project directly from lib/cpluff/libcpluff/win32/cpluff.vcxproj | 36 | # TODO: Building the project directly from lib/cpluff/libcpluff/win32/cpluff.vcxproj |
| 36 | # fails becaue it imports XBMC.defaults.props | 37 | # fails becaue it imports XBMC.defaults.props |
| 37 | BUILD_COMMAND devenv /build ${CORE_BUILD_CONFIG} | 38 | BUILD_COMMAND msbuild ${CORE_SOURCE_DIR}/project/VS2010Express/XBMC\ for\ Windows.sln |
| 38 | ${CORE_SOURCE_DIR}/project/VS2010Express/XBMC\ for\ Windows.sln | 39 | /t:cpluff /p:Configuration=${CORE_BUILD_CONFIG} |
| 39 | /project cpluff | ||
| 40 | INSTALL_COMMAND "") | 40 | INSTALL_COMMAND "") |
| 41 | # TODO: core_link_library | ||
| 42 | endif() | 41 | endif() |
| 43 | 42 | ||
| 44 | set(CPLUFF_INCLUDE_DIRS ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/cpluff/include) | 43 | set(CPLUFF_INCLUDE_DIRS ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/cpluff/include) |
