diff options
| author | Mike Weiblen <mikew@lunarg.com> | 2018-08-16 14:09:08 -0600 |
|---|---|---|
| committer | Mike Weiblen <mikew@lunarg.com> | 2018-09-12 12:26:37 -0600 |
| commit | e31a32283aa35f482f80067ded5e15a305f2a9ed (patch) | |
| tree | 1322f4079a61adc7bc3387d5d64830fa577963cc /cube/macOS | |
| parent | e88bc84edea639d028cfd8f37abd6875016fa70c (diff) | |
| download | usermoji-e31a32283aa35f482f80067ded5e15a305f2a9ed.tar.xz | |
build: CMakeLists.txt cleanup, part 1
This is a first pass reorganization of CMake files in this repo.
It consists primarily of dead code/variable removal, simplification,
and reformatting by latest cmake-format.
bump to cmake_minimum_required(3.4), for ccache support.
add USE_CCACHE
change 'ln -sf' to '-E create_symlink'
clarify why CMAKE_OSX_DEPLOYMENT_TARGET is pre-project().
sync FindVulkan.cmake from upstream CMake v3.8.0
Ensure our repos use identical copy of upstream FindVulkan.cmake
Copied from Modules/FindVulkan.cmake
https://gitlab.kitware.com/cmake/cmake.git
tag: v3.8.0 (commit da7833c5bb1f331162d46a2c664a443c1c641089)
change $<CONFIGURATION> to $<CONFIG>
The $<CONFIGURATION> genexp is officially deprecated.
change CMAKE_SYSTEM_NAME to UNIX/APPLE/WIN32
Note that UNIX evaluates true for OSX, so whenever the code intends
"Linux only", we use (UNIX AND NOT APPLE).
change TOOLS_TARGET_FOLDER to TOOLS_HELPER_FOLDER
for consistency with VVL and VL repos.
set Windows install prefix if needed
remove unused DisplayServer variable
remove deprecated GLSLANG_REPO_ROOT
The *_REPO_ROOT mechanism for finding packages is deprecated.
remove extra cmake_minimum_required
change LIBVK to Vulkan::Vulkan
change PYTHON_CMD to PYTHON_EXECUTABLE
section rulers, other cosmetics
.cmake-format.py 0.4.1
reformat using cmake-format 0.4.1
Change-Id: Id8e5b26fdcf5dc0b383de94cbec75a567704a55e
Diffstat (limited to 'cube/macOS')
| -rw-r--r-- | cube/macOS/cube/cube.cmake | 7 | ||||
| -rw-r--r-- | cube/macOS/cubepp/cubepp.cmake | 12 |
2 files changed, 13 insertions, 6 deletions
diff --git a/cube/macOS/cube/cube.cmake b/cube/macOS/cube/cube.cmake index 69952eeb..b2b6ba53 100644 --- a/cube/macOS/cube/cube.cmake +++ b/cube/macOS/cube/cube.cmake @@ -38,10 +38,13 @@ add_executable(cube MACOSX_BUNDLE ${cube_SRCS} ${cube_HDRS} ${cube_RESOURCES} cu if(NOT ${CMAKE_GENERATOR} MATCHES "^Xcode.*") # Compile the storyboard file with the ibtool. add_custom_command(TARGET cube POST_BUILD - COMMAND ${IBTOOL} --errors --warnings --notices + COMMAND ${IBTOOL} + --errors + --warnings + --notices --output-format human-readable-text --compile ${CMAKE_CURRENT_BINARY_DIR}/cube.app/Contents/Resources/Main.storyboardc - ${CMAKE_CURRENT_SOURCE_DIR}/macOS/cube/Resources/Main.storyboard + ${CMAKE_CURRENT_SOURCE_DIR}/macOS/cube/Resources/Main.storyboard COMMENT "Compiling storyboard") endif() diff --git a/cube/macOS/cubepp/cubepp.cmake b/cube/macOS/cubepp/cubepp.cmake index 7e27e9c6..2b523a98 100644 --- a/cube/macOS/cubepp/cubepp.cmake +++ b/cube/macOS/cubepp/cubepp.cmake @@ -22,8 +22,9 @@ set(cubepp_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/macOS/cubepp/AppDelegate.mm ${CMAKE_CURRENT_SOURCE_DIR}/macOS/cubepp/DemoViewController.mm) -set(cubepp_HDRS ${CMAKE_CURRENT_SOURCE_DIR}/macOS/cubepp/AppDelegate.h - ${CMAKE_CURRENT_SOURCE_DIR}/macOS/cubepp/DemoViewController.h) +set( + cubepp_HDRS ${CMAKE_CURRENT_SOURCE_DIR}/macOS/cubepp/AppDelegate.h ${CMAKE_CURRENT_SOURCE_DIR}/macOS/cubepp/DemoViewController.h + ) set(cubepp_RESOURCES ${CMAKE_BINARY_DIR}/staging-json/MoltenVK_icd.json ${CMAKE_CURRENT_SOURCE_DIR}/macOS/cubepp/Resources/LunarGIcon.icns) @@ -39,10 +40,13 @@ add_executable(cubepp MACOSX_BUNDLE ${cubepp_SRCS} ${cubepp_HDRS} ${cubepp_RESOU if(NOT ${CMAKE_GENERATOR} MATCHES "^Xcode.*") # Compile the storyboard file with the ibtool. add_custom_command(TARGET cubepp POST_BUILD - COMMAND ${IBTOOL} --errors --warnings --notices + COMMAND ${IBTOOL} + --errors + --warnings + --notices --output-format human-readable-text --compile ${CMAKE_CURRENT_BINARY_DIR}/cubepp.app/Contents/Resources/Main.storyboardc - ${CMAKE_CURRENT_SOURCE_DIR}/macOS/cubepp/Resources/Main.storyboard + ${CMAKE_CURRENT_SOURCE_DIR}/macOS/cubepp/Resources/Main.storyboard COMMENT "Compiling storyboard") endif() |