From 69b794b9e53eb7a868e011f5f5369168e0f70334 Mon Sep 17 00:00:00 2001
From: Denis Arrivault <denis.arrivault@lif.univ-mrs.fr>
Date: Wed, 8 Jun 2016 17:09:28 +0200
Subject: [PATCH] Update CMakeLists comments
---
src/main/CMakeLists.txt | 8 +++++---
src/test/CMakeLists.txt | 4 ++--
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/main/CMakeLists.txt b/src/main/CMakeLists.txt
index 7b7fcb6..f8b0b5c 100644
--- a/src/main/CMakeLists.txt
+++ b/src/main/CMakeLists.txt
@@ -3,19 +3,21 @@ project (IMMCOMPLX_JAVA_MAIN Java)
set(CMAKE_JAVA_TARGET_OUTPUT_NAME immutablecomplex-${IMMCOMPLX_VERSION})
-# Compiling the source files into a jar with a main
+# Compile the source files into a jar with a main
add_jar(immutablecomplex java/Complex.java java/Main.java
ENTRY_POINT main.java.Main
VERSION ${IMMCOMPLX_VERSION})
+# Get the jar location
get_target_property(JAR immutablecomplex JAR_FILE)
+# Set it to parent scope
set(IMMCOMPLX_JAR ${JAR} PARENT_SCOPE)
-# Installing the jar
+# Install the jar
message(STATUS "JAR_INSTALL_DIR = ${JAR_INSTALL_DIR}")
install_jar(immutablecomplex ${JAR_INSTALL_DIR})
-# Creating the javadoc
+# Create the javadoc
create_javadoc(immutablecomplex_doc
FILES java/Complex.java
CLASSPATH ${CMAKE_JAVA_INCLUDE_PATH}
diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
index d4d3e59..def66d5 100644
--- a/src/test/CMakeLists.txt
+++ b/src/test/CMakeLists.txt
@@ -4,9 +4,9 @@ project (IMMCOMPLX_JAVA_TEST Java)
set(JUNIT_JAR ${IMMCOMPLX_JAVA_DEPENDENCIES_DIR}/junit-${JUNIT_VERSION}.jar)
set(HAMCREST_JAR ${IMMCOMPLX_JAVA_DEPENDENCIES_DIR}/hamcrest-all-${HAMCREST_VERSION}.jar)
-# Compiling of the test file
+# Compile of the test file
add_jar(immutablecomplex-test java/ComplexTest.java INCLUDE_JARS ${JUNIT_JAR} ${IMMCOMPLX_JAR})
-# Getting the jar's name
+# Get the jar location
get_target_property(IMMCOMPLX_TEST_JAR immutablecomplex-test JAR_FILE)
# Adding test case for ctest
--
GitLab