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

Remove always-outdated target

Browse source
This commit is contained in:
Alexey Pelykh 2014-02-27 11:19:17 +02:00
parent 3dea3362c4
commit 09b9f77c67
1 changed files with 2 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
OsmAnd-java/CMakeLists.txt
View file

@ -21,6 +21,7 @@ if(CMAKE_HOST_WIN32 AND NOT CYGWIN)
add_custom_command(OUTPUT ${OsmAndJNI_generated_cpp}
COMMAND bash ARGS --login "${CMAKE_CURRENT_LIST_DIR}/generate-swig.sh"
DEPENDS
"${CMAKE_CURRENT_LIST_DIR}/generate-swig.sh"
${core_includes}
${core_headers}
${core_sources}
@ -34,6 +35,7 @@ else()
add_custom_command(OUTPUT ${OsmAndJNI_generated_cpp}
COMMAND "${CMAKE_CURRENT_LIST_DIR}/generate-swig.sh"
DEPENDS
"${CMAKE_CURRENT_LIST_DIR}/generate-swig.sh"
${core_includes}
${core_headers}
${core_sources}
@ -44,17 +46,6 @@ else()
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
COMMENT "Generating sources...")
endif()
add_custom_target(OsmAndJNI_generate_swig
ALL
DEPENDS
${OsmAndJNI_generated_cpp}
SOURCES
${OsmAndJNI_generated_cpp}
)
set_source_files_properties(${OsmAndJNI_generated_cpp}
PROPERTIES
GENERATED TRUE
)
if(CMAKE_SHARED_LIBS_ALLOWED_ON_TARGET)
add_library(OsmAndJNI SHARED
@ -71,9 +62,6 @@ if(CMAKE_SHARED_LIBS_ALLOWED_ON_TARGET)
${JAVA_INCLUDE_PATH}
${target_specific_private_includes}
)
add_dependencies(OsmAndJNI
OsmAndJNI_generate_swig
)
if(CMAKE_STATIC_LIBS_ALLOWED_ON_TARGET)
add_dependencies(OsmAndJNI