Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
T
Test_Project
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Denis Arrivault
Test_Project
Commits
69b794b9
Commit
69b794b9
authored
8 years ago
by
Denis Arrivault
Browse files
Options
Downloads
Patches
Plain Diff
Update CMakeLists comments
parent
45f53316
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/main/CMakeLists.txt
+5
-3
5 additions, 3 deletions
src/main/CMakeLists.txt
src/test/CMakeLists.txt
+2
-2
2 additions, 2 deletions
src/test/CMakeLists.txt
with
7 additions
and
5 deletions
src/main/CMakeLists.txt
+
5
−
3
View file @
69b794b9
...
@@ -3,19 +3,21 @@ project (IMMCOMPLX_JAVA_MAIN Java)
...
@@ -3,19 +3,21 @@ project (IMMCOMPLX_JAVA_MAIN Java)
set
(
CMAKE_JAVA_TARGET_OUTPUT_NAME immutablecomplex-
${
IMMCOMPLX_VERSION
}
)
set
(
CMAKE_JAVA_TARGET_OUTPUT_NAME immutablecomplex-
${
IMMCOMPLX_VERSION
}
)
# Compil
ing
the source files into a jar with a main
# Compil
e
the source files into a jar with a main
add_jar
(
immutablecomplex java/Complex.java java/Main.java
add_jar
(
immutablecomplex java/Complex.java java/Main.java
ENTRY_POINT main.java.Main
ENTRY_POINT main.java.Main
VERSION
${
IMMCOMPLX_VERSION
}
)
VERSION
${
IMMCOMPLX_VERSION
}
)
# Get the jar location
get_target_property
(
JAR immutablecomplex JAR_FILE
)
get_target_property
(
JAR immutablecomplex JAR_FILE
)
# Set it to parent scope
set
(
IMMCOMPLX_JAR
${
JAR
}
PARENT_SCOPE
)
set
(
IMMCOMPLX_JAR
${
JAR
}
PARENT_SCOPE
)
# Install
ing
the jar
# Install the jar
message
(
STATUS
"JAR_INSTALL_DIR =
${
JAR_INSTALL_DIR
}
"
)
message
(
STATUS
"JAR_INSTALL_DIR =
${
JAR_INSTALL_DIR
}
"
)
install_jar
(
immutablecomplex
${
JAR_INSTALL_DIR
}
)
install_jar
(
immutablecomplex
${
JAR_INSTALL_DIR
}
)
# Creat
ing
the javadoc
# Creat
e
the javadoc
create_javadoc
(
immutablecomplex_doc
create_javadoc
(
immutablecomplex_doc
FILES java/Complex.java
FILES java/Complex.java
CLASSPATH
${
CMAKE_JAVA_INCLUDE_PATH
}
CLASSPATH
${
CMAKE_JAVA_INCLUDE_PATH
}
...
...
This diff is collapsed.
Click to expand it.
src/test/CMakeLists.txt
+
2
−
2
View file @
69b794b9
...
@@ -4,9 +4,9 @@ project (IMMCOMPLX_JAVA_TEST Java)
...
@@ -4,9 +4,9 @@ project (IMMCOMPLX_JAVA_TEST Java)
set
(
JUNIT_JAR
${
IMMCOMPLX_JAVA_DEPENDENCIES_DIR
}
/junit-
${
JUNIT_VERSION
}
.jar
)
set
(
JUNIT_JAR
${
IMMCOMPLX_JAVA_DEPENDENCIES_DIR
}
/junit-
${
JUNIT_VERSION
}
.jar
)
set
(
HAMCREST_JAR
${
IMMCOMPLX_JAVA_DEPENDENCIES_DIR
}
/hamcrest-all-
${
HAMCREST_VERSION
}
.jar
)
set
(
HAMCREST_JAR
${
IMMCOMPLX_JAVA_DEPENDENCIES_DIR
}
/hamcrest-all-
${
HAMCREST_VERSION
}
.jar
)
# Compil
ing
of the test file
# Compil
e
of the test file
add_jar
(
immutablecomplex-test java/ComplexTest.java INCLUDE_JARS
${
JUNIT_JAR
}
${
IMMCOMPLX_JAR
}
)
add_jar
(
immutablecomplex-test java/ComplexTest.java INCLUDE_JARS
${
JUNIT_JAR
}
${
IMMCOMPLX_JAR
}
)
# Get
ting
the jar
's name
# Get the jar
location
get_target_property
(
IMMCOMPLX_TEST_JAR immutablecomplex-test JAR_FILE
)
get_target_property
(
IMMCOMPLX_TEST_JAR immutablecomplex-test JAR_FILE
)
# Adding test case for ctest
# Adding test case for ctest
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment