diff options
| author | Forkk <forkk@forkk.net> | 2014-01-08 21:45:13 -0600 |
|---|---|---|
| committer | Forkk <forkk@forkk.net> | 2014-01-08 21:45:13 -0600 |
| commit | 06b5fa5dccdfc54496cd79e6eba6d025bc6e1204 (patch) | |
| tree | 83d2f49d9e694bdd8f8d2cdd3879e696f435ba10 /depends | |
| parent | 51817962aa64bc5c084e33fb29a21261d19bc8f3 (diff) | |
| parent | b767d4b134148ddb3f956253a2f7f2cad831e782 (diff) | |
| download | PrismLauncher-06b5fa5dccdfc54496cd79e6eba6d025bc6e1204.tar.gz PrismLauncher-06b5fa5dccdfc54496cd79e6eba6d025bc6e1204.tar.bz2 PrismLauncher-06b5fa5dccdfc54496cd79e6eba6d025bc6e1204.zip | |
Merge branch 'release-0.1'
Release MultiMC version 0.1.
Diffstat (limited to 'depends')
| -rw-r--r-- | depends/javacheck/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | depends/launcher/CMakeLists.txt | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/depends/javacheck/CMakeLists.txt b/depends/javacheck/CMakeLists.txt index e72c9552..10b9a716 100644 --- a/depends/javacheck/CMakeLists.txt +++ b/depends/javacheck/CMakeLists.txt @@ -5,10 +5,11 @@ find_package(Java 1.6 REQUIRED COMPONENTS Development) include(UseJava) set(CMAKE_JAVA_JAR_ENTRY_POINT JavaCheck) set(CMAKE_JAVA_COMPILE_FLAGS -target 1.6 -source 1.6 -Xlint:deprecation -Xlint:unchecked) -#set(CMAKE_JAVA_TARGET_OUTPUT_DIR "${PROJECT_SOURCE_DIR}/../../resources") set(SRC JavaCheck.java ) -add_jar(JavaCheck ${SRC})
\ No newline at end of file +add_jar(JavaCheck ${SRC}) + +INSTALL_JAR(JavaCheck "${BINARY_DEST_DIR}/jars") diff --git a/depends/launcher/CMakeLists.txt b/depends/launcher/CMakeLists.txt index e91d5bd6..729ebb67 100644 --- a/depends/launcher/CMakeLists.txt +++ b/depends/launcher/CMakeLists.txt @@ -5,7 +5,6 @@ find_package(Java 1.6 REQUIRED COMPONENTS Development) include(UseJava) set(CMAKE_JAVA_JAR_ENTRY_POINT MultiMCLauncher) set(CMAKE_JAVA_COMPILE_FLAGS -target 1.6 -source 1.6 -Xlint:deprecation -Xlint:unchecked) -#set(CMAKE_JAVA_TARGET_OUTPUT_DIR "${PROJECT_SOURCE_DIR}/../../resources") set(SRC MultiMCLauncher.java @@ -19,3 +18,5 @@ set(SRC ) add_jar(MultiMCLauncher ${SRC}) + +INSTALL_JAR(MultiMCLauncher "${BINARY_DEST_DIR}/jars") |