summaryrefslogtreecommitdiffstats
path: root/depends/launcher
diff options
context:
space:
mode:
authorForkk <forkk@forkk.net>2014-01-07 18:31:49 -0600
committerForkk <forkk@forkk.net>2014-01-07 18:31:49 -0600
commit3629f9b9995e375dad181268f5a70dc6cb7697a2 (patch)
treedf2a719ebb12f129165c487ab730a6328c9750e7 /depends/launcher
parenta14eeab2d6f6437f0cbd7402537ef6634085f7ac (diff)
parentfb83299e592ef7627d5914e0fbce70c570981124 (diff)
downloadMultiMC-3629f9b9995e375dad181268f5a70dc6cb7697a2.tar
MultiMC-3629f9b9995e375dad181268f5a70dc6cb7697a2.tar.gz
MultiMC-3629f9b9995e375dad181268f5a70dc6cb7697a2.tar.lz
MultiMC-3629f9b9995e375dad181268f5a70dc6cb7697a2.tar.xz
MultiMC-3629f9b9995e375dad181268f5a70dc6cb7697a2.zip
Merge branch 'develop' of github.com:MultiMC/MultiMC5 into new-version-system
Diffstat (limited to 'depends/launcher')
-rw-r--r--depends/launcher/CMakeLists.txt3
1 files changed, 2 insertions, 1 deletions
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")