diff options
| author | Sefa Eyeoglu <contact@scrumplex.net> | 2022-03-19 15:59:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-19 15:59:38 +0100 |
| commit | 06d16c6b13cc2253b7ccae19f351a263c9551384 (patch) | |
| tree | 7924279b3cc26438bab8d9923bba46b0aa769595 | |
| parent | abb9fa8cbd427049aadf0787d1e54065a087b032 (diff) | |
| parent | 2d1f99b765ef0870c2a78db890c673bb6d0bbcae (diff) | |
| download | PrismLauncher-06d16c6b13cc2253b7ccae19f351a263c9551384.tar.gz PrismLauncher-06d16c6b13cc2253b7ccae19f351a263c9551384.tar.bz2 PrismLauncher-06d16c6b13cc2253b7ccae19f351a263c9551384.zip | |
Merge pull request #295 from Scrumplex/fix-portable
Make Launcher_PORTABLE work on all platforms
| -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}) |