Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix

Browse source
This commit is contained in:
Alexey Pelykh 2013-08-19 11:15:19 +03:00
parent 5ce508d918
commit 0ac2f471e6
1 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
OsmAnd-java/CMakeLists.txt
View file

@ -23,8 +23,12 @@ file(GLOB_RECURSE core_headers_client "${OSMAND_ROOT}/core/client/*.h*")
file(GLOB_RECURSE core_sources_client "${OSMAND_ROOT}/core/client/*.c*") file(GLOB_RECURSE core_sources_client "${OSMAND_ROOT}/core/client/*.c*")
file(GLOB core_swig "${OSMAND_ROOT}/core.swig") file(GLOB core_swig "${OSMAND_ROOT}/core.swig")
file(GLOB_RECURSE core_swig_subfiles "${OSMAND_ROOT}/swig/*") file(GLOB_RECURSE core_swig_subfiles "${OSMAND_ROOT}/swig/*")
set(OsmAndJNI_generated_cpp
"${CMAKE_CURRENT_LIST_DIR}/c-src/swig.cpp"
)
if(CMAKE_HOST_WIN32 AND NOT CYGWIN) if(CMAKE_HOST_WIN32 AND NOT CYGWIN)
add_custom_command(OUTPUT "${CMAKE_CURRENT_LIST_DIR}/c-src/swig.cpp" add_custom_command(OUTPUT ${OsmAndJNI_generated_cpp}
COMMAND bash ARGS --login "${CMAKE_CURRENT_LIST_DIR}/generate-swig.sh" COMMAND bash ARGS --login "${CMAKE_CURRENT_LIST_DIR}/generate-swig.sh"
DEPENDS DEPENDS
${core_includes} ${core_includes}
@ -34,9 +38,10 @@ if(CMAKE_HOST_WIN32 AND NOT CYGWIN)
${core_sources_client} ${core_sources_client}
${core_swig} ${core_swig}
${core_swig_subfiles} ${core_swig_subfiles}
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
COMMENT "Generating sources...") COMMENT "Generating sources...")
else() else()
add_custom_command(OUTPUT "${CMAKE_CURRENT_LIST_DIR}/c-src/swig.cpp" add_custom_command(OUTPUT ${OsmAndJNI_generated_cpp}
COMMAND "${CMAKE_CURRENT_LIST_DIR}/generate-swig.sh" COMMAND "${CMAKE_CURRENT_LIST_DIR}/generate-swig.sh"
DEPENDS DEPENDS
${core_includes} ${core_includes}
@ -46,18 +51,24 @@ else()
${core_sources_client} ${core_sources_client}
${core_swig} ${core_swig}
${core_swig_subfiles} ${core_swig_subfiles}
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
COMMENT "Generating sources...") COMMENT "Generating sources...")
endif() endif()
add_custom_target(OsmAndJNI_generate_swig add_custom_target(OsmAndJNI_generate_swig
ALL ALL
# DEPENDS DEPENDS
# "${CMAKE_CURRENT_LIST_DIR}/c-src/swig.cpp" ${OsmAndJNI_generated_cpp}
SOURCES
${OsmAndJNI_generated_cpp}
)
set_source_files_properties(${OsmAndJNI_generated_cpp}
PROPERTIES
GENERATED TRUE
) )
set_source_files_properties("${CMAKE_CURRENT_LIST_DIR}/c-src/swig.cpp" PROPERTIES GENERATED TRUE)
if(CMAKE_SHARED_LIBS_ALLOWED_ON_TARGET) if(CMAKE_SHARED_LIBS_ALLOWED_ON_TARGET)
add_library(OsmAndJNI SHARED add_library(OsmAndJNI SHARED
"c-src/swig.cpp" ${OsmAndJNI_generated_cpp}
) )
target_compile_definitions(OsmAndJNI target_compile_definitions(OsmAndJNI
PRIVATE PRIVATE