From 09b9f77c67295379b5e658a966d98d90e465f8c5 Mon Sep 17 00:00:00 2001 From: Alexey Pelykh Date: Thu, 27 Feb 2014 11:19:17 +0200 Subject: [PATCH] Remove always-outdated target --- OsmAnd-java/CMakeLists.txt | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/OsmAnd-java/CMakeLists.txt b/OsmAnd-java/CMakeLists.txt index 2364fdb50c..48fed86fc2 100644 --- a/OsmAnd-java/CMakeLists.txt +++ b/OsmAnd-java/CMakeLists.txt @@ -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