The-Homebrew-Cloud/wut
2
0
Fork 0
mirror of https://github.com/wiiu-env/wut.git synced 2025-01-07 11:28:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

cmake: Cleanup some CMake stuff.

Browse Source
This commit is contained in:
James Benton 2018-06-15 13:59:55 +01:00
parent f9799cf3dd
commit 39429c0cbc
5 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cafe/CMakeLists.txt
View File

@ -1,4 +1,11 @@
cmake_minimum_required(VERSION 3.2) cmake_minimum_required(VERSION 3.2)
# Load up the in-tree toolchain
set(WUT_ROOT "{CMAKE_CURRENT_SOURCE_DIR}/.." CACHE STRING "")
set(WUT_RPLIMPORTGEN "" CACHE STRING "")
set(ENV{WUT_ROOT} ${WUT_ROOT})
set(CMAKE_TOOLCHAIN_FILE $ENV{WUT_ROOT}/share/wut.toolchain.cmake)
project(cafe C CXX) project(cafe C CXX)
enable_language(ASM) enable_language(ASM)

6
libraries/CMakeLists.txt
View File

@ -1,4 +1,10 @@
cmake_minimum_required(VERSION 3.2) cmake_minimum_required(VERSION 3.2)
# Load up the in-tree toolchain
set(WUT_ROOT "{CMAKE_CURRENT_SOURCE_DIR}/.." CACHE STRING "")
set(ENV{WUT_ROOT} ${WUT_ROOT})
set(CMAKE_TOOLCHAIN_FILE $ENV{WUT_ROOT}/share/wut.toolchain.cmake)
project(libraries C) project(libraries C)
add_subdirectory(libgfd) add_subdirectory(libgfd)

1
samples/CMakeLists.txt
View File

@ -1,4 +1,5 @@
cmake_minimum_required(VERSION 3.2) cmake_minimum_required(VERSION 3.2)
set(CMAKE_TOOLCHAIN_FILE $ENV{WUT_ROOT}/share/wut.toolchain.cmake)
project(samples) project(samples)
include("${WUT_ROOT}/share/wut.cmake" REQUIRED) include("${WUT_ROOT}/share/wut.cmake" REQUIRED)

6
share/wut.toolchain.cmake
View File

@ -10,11 +10,7 @@ if(NOT DEFINED ENV{DEVKITPPC})
endif() endif()
if(NOT DEFINED ENV{WUT_ROOT}) if(NOT DEFINED ENV{WUT_ROOT})
if(EXISTS ${CMAKE_CURRENT_LIST_DIR}/../share/wut.cmake) message(FATAL_ERROR "You must have defined WUT_ROOT before calling cmake.")
get_filename_component(ENV{WUT_ROOT} ${CMAKE_CURRENT_LIST_DIR} DIRECTORY)
else()
message(FATAL_ERROR "You must have defined WUT_ROOT before calling cmake.")
endif()
endif() endif()
set(DEVKITPPC $ENV{DEVKITPPC}) set(DEVKITPPC $ENV{DEVKITPPC})

10
tools/CMakeLists.txt
View File

@ -1,12 +1,8 @@
project(tools) project(tools)
if(MSVC) set(CMAKE_CXX_STANDARD 14)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /std:c++latest") set(CMAKE_CXX_STANDARD_REQUIRED ON)
elseif(APPLE) set(CMAKE_CXX_EXTENSIONS OFF)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++1z")
else()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
endif()
add_subdirectory(libraries) add_subdirectory(libraries)