Changeset 151:d765198cdb48 in verona

Timestamp:

Mar 23, 2011 11:17:22 AM (2 years ago)

Author:

Nikita Kozlov <nikita@…>

Branch:

default

Children:

153:ece45ca8ffe3, 154:cead031da2b4

Message:

fix build for android

Files:

• CMakeLists.txt (modified) (1 diff)
• swig/CMakeLists.txt (modified) (3 diffs)

CMakeLists.txt

@@ -31 +31 @@
 endif(CMAKE_UNDER_CE)
 
-if(ANDROID)
-  subdirs(jni)
-endif(ANDROID)
-
 if(WIN32)
   subdirs(phapi/msdirent)

swig/CMakeLists.txt

@@ -20 +20 @@
 set(SWIG_VERONA_LIBRARIES phapi m c ${MEDIASTREAMER_LIBRARIES} ${SPEEX_LIBRARIES} ${SPEEXDSP_LIBRARIES})
 SET_SOURCE_FILES_PROPERTIES(verona.i PROPERTIES CPLUSPLUS ON)
-SET_SOURCE_FILES_PROPERTIES(verona.i PROPERTIES SWIG_FLAGS "-c++ -threads")
-SET_SOURCE_FILES_PROPERTIES(verona.i PROPERTIES SWIG_FLAGS "-threads")
+SET_SOURCE_FILES_PROPERTIES(verona.i PROPERTIES SWIG_FLAGS "-c++")
 set(CMAKE_SWIG_FLAGS ${CMAKE_SWIG_FLAGS} "-I${CMAKE_CURRENT_SOURCE_DIR}/../phcpp" "-I${CMAKE_CURRENT_SOURCE_DIR}/../phapi")
 
@@ -27 +26 @@
 
 if (ANDROID)
-set(CMAKE_SWIG_FLAGS ${CMAKE_SWIG_FLAGS} "-I${CMAKE_CURRENT_SOURCE_DIR}/../phcpp"  "-I${CMAKE_CURRENT_SOURCE_DIR}/../swig/java" "-package" "com.mbdsys.qutecom.service.swig")
+set(CMAKE_SWIG_FLAGS ${CMAKE_SWIG_FLAGS} "-I${CMAKE_CURRENT_SOURCE_DIR}/../phcpp"  "-I${CMAKE_CURRENT_SOURCE_DIR}/../swig/java" "-package" "com.mbdsys.qutecom.service.swig.phapi")
 
 SWIG_ADD_MODULE(jni_verona java verona.i ../phcpp/phapipp.cpp)
@@ -34 +33 @@
 
 if(NOT CMAKE_UNDER_CE AND NOT ANDROID)
+SET_SOURCE_FILES_PROPERTIES(verona.i PROPERTIES SWIG_FLAGS "-threads")
 SWIG_ADD_MODULE(py_verona python verona.i ../phcpp/phapipp.cpp)
 SWIG_LINK_LIBRARIES(py_verona ${SWIG_VERONA_LIBRARIES})