summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCsaba Kert├ęsz <[email protected]>2017-05-23 21:16:09 +0300
committerJasem Mutlaq <[email protected]>2017-05-23 21:16:09 +0300
commit7b3e646446722706135c0a55008ef88f3ccf4435 (patch)
treeed19f8e15e3fee6ec6882bb1080be7a01a29cdca
parentd2c6cb3969d207de8d3c565c870b82897ebffc46 (diff)
Final fixes for Android
-rw-r--r--CMakeLists.txt2
-rw-r--r--README.android2
-rw-r--r--kstars/CMakeLists.txt2
3 files changed, 3 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5c2a682..929eb2d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -120,7 +120,7 @@ if(BUILD_KSTARS_LITE)
if(ANDROID)
externalproject_add(cfitsio SOURCE_DIR "${CMAKE_BINARY_DIR}/android/3rdparty/cfitsio"
URL https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/cfitsio3370.tar.gz
- PATCH_COMMAND bash -c "cd ${CMAKE_BINARY_DIR}/android/3rdparty/cfitsio && patch -p0 < ${CMAKE_SOURCE_DIR}/android/3rdparty/cfitsio.patch"
+ PATCH_COMMAND bash -c "cd ${CMAKE_BINARY_DIR}/android/3rdparty/cfitsio && dos2unix ${CMAKE_BINARY_DIR}/android/3rdparty/cfitsio/CMakeLists.txt && patch -p0 < ${CMAKE_SOURCE_DIR}/android/3rdparty/cfitsio.patch"
CMAKE_ARGS -DCMAKE_TOOLCHAIN_FILE=${CMAKE_SOURCE_DIR}/android/toolchain-android.cmake -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
BUILD_COMMAND make cfitsio
BUILD_IN_SOURCE 1
diff --git a/README.android b/README.android
index 41005e3..c9a016c 100644
--- a/README.android
+++ b/README.android
@@ -7,6 +7,7 @@ Prerequisites:
(https://bugreports.qt.io/browse/QTBUG-54666) what can be fixed by only patching one cmake config file.
The build files will comment the problematic line.
- Get KStars source code from from Github or KDE
+- sudo apt-get install dos2unix
Set the following environmental variables before building:
@@ -42,7 +43,6 @@ cmake -B. -H.. -DBUILD_KSTARS_LITE=ON -DCMAKE_TOOLCHAIN_FILE=android/toolchain-a
- Compile:
-make -j4 indi
make -j4
- Install:
diff --git a/kstars/CMakeLists.txt b/kstars/CMakeLists.txt
index 4aaf8c8..feb08c4 100644
--- a/kstars/CMakeLists.txt
+++ b/kstars/CMakeLists.txt
@@ -1029,7 +1029,7 @@ endif(NOT BUILD_KSTARS_LITE)
if (ANDROID)
add_library(kstars SHARED ${KSTARS_APP_SRCS})
add_dependencies(KStarsLib cfitsio indi nova raw)
- target_link_libraries(kstars KStarsLib ${CMAKE_SOURCE_DIR}/android/hack/locale.o -lgnustl_static)
+ target_link_libraries(kstars KStarsLib ${CMAKE_SOURCE_DIR}/android/hack/locale.ho -lgnustl_static)
else ()
add_executable(kstars ${KSTARS_APP_SRCS})
target_link_libraries(kstars KStarsLib)