diff options
| author | flow <thiagodonato300@gmail.com> | 2022-03-24 18:24:51 -0300 |
|---|---|---|
| committer | flow <thiagodonato300@gmail.com> | 2022-03-24 18:24:51 -0300 |
| commit | e13ca94061c7fdfec9bd18b982b56a8d5a1f80b0 (patch) | |
| tree | c04986ab61f789e4a01b854c374dc8ee15f4dffa /CMakeLists.txt | |
| parent | da43ed8ce1d804fe20c44788577a0387a698ed6e (diff) | |
| parent | 92f3154e8f7c1421541a00ae7cf57f188cfe46a5 (diff) | |
| download | PrismLauncher-e13ca94061c7fdfec9bd18b982b56a8d5a1f80b0.tar.gz PrismLauncher-e13ca94061c7fdfec9bd18b982b56a8d5a1f80b0.tar.bz2 PrismLauncher-e13ca94061c7fdfec9bd18b982b56a8d5a1f80b0.zip | |
chore: resolve conflicts and merge upstream
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 7cd0cf86..7537703c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -152,6 +152,10 @@ add_subdirectory(program_info) # Install the build results according to platform set(Launcher_PORTABLE 1 CACHE BOOL "The type of installation (Portable or System)") +if (Launcher_PORTABLE) + # launcher/Application.cpp will use this value + set(Launcher_APP_BINARY_DEFS "-DLAUNCHER_PORTABLE") +endif() if(UNIX AND APPLE) set(BINARY_DEST_DIR "${Launcher_Name}.app/Contents/MacOS") @@ -191,9 +195,6 @@ elseif(UNIX) set(BUNDLE_DEST_DIR ".") set(JARS_DEST_DIR "bin/jars") - # launcher/Application.cpp will use this value - set(Launcher_APP_BINARY_DEFS "-DLAUNCHER_PORTABLE") - # Install basic runner script configure_file(launcher/Launcher.in "${CMAKE_CURRENT_BINARY_DIR}/LauncherScript" @ONLY) install(PROGRAMS "${CMAKE_CURRENT_BINARY_DIR}/LauncherScript" DESTINATION ${BUNDLE_DEST_DIR} RENAME ${Launcher_Name}) |