From 30d12dd99ac7b405e83cac98aa0c373548728487 Mon Sep 17 00:00:00 2001 From: Alex Domingo Date: Thu, 9 Feb 2023 17:36:25 +0100 Subject: [PATCH] locate the ngs directory directly in TARGDIR --- ngs/ngs-java/CMakeLists.txt | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/ngs/ngs-java/CMakeLists.txt b/ngs/ngs-java/CMakeLists.txt index d16b5a94f..df456a60e 100755 --- a/ngs/ngs-java/CMakeLists.txt +++ b/ngs/ngs-java/CMakeLists.txt @@ -140,17 +140,12 @@ if ( Java_FOUND ) set(SRC_FILES "${SRC_FILES} ${f}") endforeach() - if( ${OS} STREQUAL "windows" ) - set( NGS_JAVADOC_DIR ${TARGDIR} ) - else() - set( NGS_JAVADOC_DIR ${TARGDIR}/obj ) - endif() if ( Java_JAR_EXECUTABLE AND NOT (${OS} STREQUAL "windows") ) add_custom_target( ngs-doc-jar ALL COMMAND bash -c "${Java_JAR_EXECUTABLE} -cf ${CMAKE_JAR_OUTPUT_DIRECTORY}/ngs-doc.jar ." DEPENDS ngs-doc_javadoc - WORKING_DIRECTORY "${NGS_JAVADOC_DIR}/ngs/ngs-java/javadoc/ngs-doc" + WORKING_DIRECTORY "${TARGDIR}/ngs/ngs-java/javadoc/ngs-doc" ) install( FILES ${CMAKE_JAR_OUTPUT_DIRECTORY}/ngs-doc.jar DESTINATION ${CMAKE_INSTALL_PREFIX}/jar/ ) @@ -166,7 +161,7 @@ if ( Java_FOUND ) ngs-doc-jar ALL COMMAND "${Java_JAR_EXECUTABLE}" -cf "${CMAKE_JAR_OUTPUT_DIRECTORY}/ngs-doc.jar" . DEPENDS ngs-doc_javadoc - WORKING_DIRECTORY "${NGS_JAVADOC_DIR}/ngs/ngs-java/javadoc/ngs-doc" + WORKING_DIRECTORY "${TARGDIR}/ngs/ngs-java/javadoc/ngs-doc" ) install( FILES ${CMAKE_JAR_OUTPUT_DIRECTORY}/ngs-doc.jar DESTINATION ${CMAKE_INSTALL_PREFIX}/jar/ )