summaryrefslogtreecommitdiffstats
path: root/depends
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2014-01-08 01:27:40 +0100
committerPetr Mrázek <peterix@gmail.com>2014-01-08 01:28:33 +0100
commitfb83299e592ef7627d5914e0fbce70c570981124 (patch)
tree573fb7524aed0059ec596bc9b426d8417469fd0f /depends
parent28cb66e85cad786f08b40cf242cb17a70d9e7432 (diff)
downloadMultiMC-fb83299e592ef7627d5914e0fbce70c570981124.tar
MultiMC-fb83299e592ef7627d5914e0fbce70c570981124.tar.gz
MultiMC-fb83299e592ef7627d5914e0fbce70c570981124.tar.lz
MultiMC-fb83299e592ef7627d5914e0fbce70c570981124.tar.xz
MultiMC-fb83299e592ef7627d5914e0fbce70c570981124.zip
Deploy jars instead of extracting them at runtime, remove non-working nvidia fix
Diffstat (limited to 'depends')
-rw-r--r--depends/javacheck/CMakeLists.txt5
-rw-r--r--depends/launcher/CMakeLists.txt3
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")