diff options
| author | manuel <manuel@mausz.at> | 2016-12-14 02:24:46 +0100 |
|---|---|---|
| committer | manuel <manuel@mausz.at> | 2016-12-14 02:24:46 +0100 |
| commit | a662ba767a6444b76b0394eb60380eee3e839db7 (patch) | |
| tree | a13d904b75e8d899e2b11df3db5bd2a8a47b0acb /project/cmake/modules/FindCpluff.cmake | |
| parent | 2818eb9609d118212211cd657134974f10428b31 (diff) | |
| download | kodi-pvr-build-a662ba767a6444b76b0394eb60380eee3e839db7.tar.gz kodi-pvr-build-a662ba767a6444b76b0394eb60380eee3e839db7.tar.bz2 kodi-pvr-build-a662ba767a6444b76b0394eb60380eee3e839db7.zip | |
Sync with Krypton branch
Diffstat (limited to 'project/cmake/modules/FindCpluff.cmake')
| -rw-r--r-- | project/cmake/modules/FindCpluff.cmake | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/project/cmake/modules/FindCpluff.cmake b/project/cmake/modules/FindCpluff.cmake index ce6c127..fb2bb25 100644 --- a/project/cmake/modules/FindCpluff.cmake +++ b/project/cmake/modules/FindCpluff.cmake | |||
| @@ -10,13 +10,6 @@ if(NOT WIN32) | |||
| 10 | string(REPLACE ";" " " defines "${CMAKE_C_FLAGS} ${SYSTEM_DEFINES} -I${EXPAT_INCLUDE_DIR}") | 10 | string(REPLACE ";" " " defines "${CMAKE_C_FLAGS} ${SYSTEM_DEFINES} -I${EXPAT_INCLUDE_DIR}") |
| 11 | get_filename_component(expat_dir ${EXPAT_LIBRARY} DIRECTORY) | 11 | get_filename_component(expat_dir ${EXPAT_LIBRARY} DIRECTORY) |
| 12 | set(ldflags "-L${expat_dir}") | 12 | set(ldflags "-L${expat_dir}") |
| 13 | |||
| 14 | # iOS: Without specifying -arch, configure tries to use /bin/cpp as C-preprocessor | ||
| 15 | # http://stackoverflow.com/questions/38836754/cant-cross-compile-c-library-for-arm-ios | ||
| 16 | if(CORE_SYSTEM_NAME STREQUAL ios) | ||
| 17 | set(cppflags "-arch ${CPU}") | ||
| 18 | endif() | ||
| 19 | |||
| 20 | ExternalProject_Add(libcpluff SOURCE_DIR ${CORE_SOURCE_DIR}/lib/cpluff | 13 | ExternalProject_Add(libcpluff SOURCE_DIR ${CORE_SOURCE_DIR}/lib/cpluff |
| 21 | BUILD_IN_SOURCE 1 | 14 | BUILD_IN_SOURCE 1 |
| 22 | PREFIX ${CORE_BUILD_DIR}/cpluff | 15 | PREFIX ${CORE_BUILD_DIR}/cpluff |
| @@ -29,7 +22,6 @@ if(NOT WIN32) | |||
| 29 | --libdir=<INSTALL_DIR>/lib | 22 | --libdir=<INSTALL_DIR>/lib |
| 30 | --host=${ARCH} | 23 | --host=${ARCH} |
| 31 | CFLAGS=${defines} | 24 | CFLAGS=${defines} |
| 32 | CPPFLAGS=${cppflags} | ||
| 33 | LDFLAGS=${ldflags}) | 25 | LDFLAGS=${ldflags}) |
| 34 | ExternalProject_Add_Step(libcpluff autoreconf | 26 | ExternalProject_Add_Step(libcpluff autoreconf |
| 35 | DEPENDEES download update patch | 27 | DEPENDEES download update patch |
