games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-28 08:48:48 +02:00
Code Issues Releases Activity

fix leading whitespace

Browse Source
This commit is contained in:
Andrey Filipenkov 2021-03-02 03:56:54 +03:00
parent 7a50620e61
commit d6a92f23aa
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
CMakeLists.txt
View File

@ -27,11 +27,11 @@ project(VCMI)
# - Make FindFuzzyLite check for the right version and disable FORCE_BUNDLED_FL by default
if(APPLE)
if(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
set(APPLE_MACOS 1)
else()
set(APPLE_IOS 1)
endif()
if(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
set(APPLE_MACOS 1)
else()
set(APPLE_IOS 1)
endif()
endif(APPLE)
############################################
@ -52,7 +52,7 @@ set(VCMI_VERSION_PATCH 0)
option(ENABLE_ERM "Enable compilation of ERM scripting module" OFF)
option(ENABLE_LUA "Enable compilation of LUA scripting module" OFF)
if(NOT APPLE_IOS)
option(ENABLE_LAUNCHER "Enable compilation of launcher" ON)
option(ENABLE_LAUNCHER "Enable compilation of launcher" ON)
endif()
option(ENABLE_TEST "Enable compilation of unit tests" ON)
if(NOT ${CMAKE_VERSION} VERSION_LESS "3.16.0")
@ -64,7 +64,7 @@ option(ENABLE_MULTI_PROCESS_BUILDS "Enable /MP flag for MSVS solution" ON)
# Used for Snap packages and also useful for debugging
if(NOT APPLE_IOS)
option(ENABLE_MONOLITHIC_INSTALL "Install everything in single directory on Linux and Mac" OFF)
option(ENABLE_MONOLITHIC_INSTALL "Install everything in single directory on Linux and Mac" OFF)
endif()
# Allow to pass package name from Travis CI
@ -329,13 +329,13 @@ elseif(APPLE)
set(DATA_DIR "." CACHE STRING "Where to install data files")
else()
set(APP_BUNDLE_DIR "${CMAKE_PROJECT_NAME}.app")
if(APPLE_MACOS)
set(APP_BUNDLE_CONTENTS_DIR "${APP_BUNDLE_DIR}/Contents")
set(APP_BUNDLE_BINARY_DIR "${APP_BUNDLE_CONTENTS_DIR}/MacOS")
else()
set(APP_BUNDLE_CONTENTS_DIR "${APP_BUNDLE_DIR}")
set(APP_BUNDLE_BINARY_DIR "${APP_BUNDLE_DIR}")
endif(APPLE_MACOS)
if(APPLE_MACOS)
set(APP_BUNDLE_CONTENTS_DIR "${APP_BUNDLE_DIR}/Contents")
set(APP_BUNDLE_BINARY_DIR "${APP_BUNDLE_CONTENTS_DIR}/MacOS")
else()
set(APP_BUNDLE_CONTENTS_DIR "${APP_BUNDLE_DIR}")
set(APP_BUNDLE_BINARY_DIR "${APP_BUNDLE_DIR}")
endif(APPLE_MACOS)
set(APP_BUNDLE_RESOURCES_DIR "${APP_BUNDLE_CONTENTS_DIR}/Resources")
set(BIN_DIR "${APP_BUNDLE_BINARY_DIR}" CACHE STRING "Where to install binaries")

4
client/CMakeLists.txt
View File

@ -177,8 +177,8 @@ if(WIN32)
target_compile_definitions(vcmiclient PRIVATE WINDOWS_IGNORE_PACKING_MISMATCH)
elseif(APPLE_IOS)
target_link_libraries(vcmiclient PRIVATE
"-framework QuartzCore -framework CoreGraphics -framework CoreServices -framework ImageIO" # SDL2_image
)
"-framework QuartzCore -framework CoreGraphics -framework CoreServices -framework ImageIO" # SDL2_image
)
endif()
target_link_libraries(vcmiclient PRIVATE