From ccb11fa363bfbef6b1c283a819cd11e201321f43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?= Date: Mon, 3 Oct 2016 16:55:20 +0200 Subject: [PATCH] Add javadoc target as dependence of all target when ENABLE_JAVADOC is enabled --- coreapi/help/CMakeLists.txt | 2 +- coreapi/help/generate_javadoc.sh.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/coreapi/help/CMakeLists.txt b/coreapi/help/CMakeLists.txt index fb6c39278..64a18c024 100644 --- a/coreapi/help/CMakeLists.txt +++ b/coreapi/help/CMakeLists.txt @@ -59,7 +59,7 @@ if(ENABLE_JAVADOC) set(JAVADOC_OUTPUT_DIR "${CMAKE_CURRENT_BINARY_DIR}/doc/java") set(JAVADOC_LOGFILE "${CMAKE_CURRENT_BINARY_DIR}/javadoc.log") configure_file("generate_javadoc.sh.in" "generate_javadoc.sh" @ONLY) - add_custom_target(javadoc + add_custom_target(javadoc ALL COMMAND "${CMAKE_CURRENT_BINARY_DIR}/generate_javadoc.sh" ) endif() diff --git a/coreapi/help/generate_javadoc.sh.in b/coreapi/help/generate_javadoc.sh.in index 0c4595ddb..b2af1b048 100755 --- a/coreapi/help/generate_javadoc.sh.in +++ b/coreapi/help/generate_javadoc.sh.in @@ -1,4 +1,4 @@ -#!/bin/bash -x +#!/bin/bash packages='@JAVADOC_PACKAGES@' classpaths='@JAVADOC_CLASSPATHS@'