From c1839aed89dae004114ae127f090840f7d8bbf1c Mon Sep 17 00:00:00 2001 From: Wolfgang Thaller Date: Tue, 22 Jan 2019 18:29:03 +0100 Subject: [PATCH] minor cmakelists cleanup --- AutomatedTests/CMakeLists.txt | 3 --- CMakeLists.txt | 2 +- Elf2Mac/CMakeLists.txt | 2 -- ResourceFiles/CMakeLists.txt | 2 -- Rez/CMakeLists.txt | 2 -- Samples/Dialog/CMakeLists.txt | 2 -- Samples/HelloWorld/CMakeLists.txt | 2 -- Samples/Launcher/CMakeLists.txt | 2 -- Samples/Raytracer/CMakeLists.txt | 2 -- Samples/WDEF/CMakeLists.txt | 2 -- TestApps/CMakeLists.txt | 2 -- libretro/CMakeLists.txt | 2 -- 12 files changed, 1 insertion(+), 24 deletions(-) diff --git a/AutomatedTests/CMakeLists.txt b/AutomatedTests/CMakeLists.txt index dc267a5e2e..c67482f3dd 100644 --- a/AutomatedTests/CMakeLists.txt +++ b/AutomatedTests/CMakeLists.txt @@ -1,6 +1,3 @@ -cmake_minimum_required(VERSION 3.3) - - find_program(LAUNCH_APPL LaunchAPPL PATH "${CMAKE_INSTALL_PREFIX}/../bin/") execute_process(COMMAND ${LAUNCH_APPL} --list-emulators OUTPUT_VARIABLE EMULATOR_LIST) diff --git a/CMakeLists.txt b/CMakeLists.txt index 18cc4ae8df..2abd369202 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,7 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Retro68. If not, see . -cmake_minimum_required(VERSION 3.3) +cmake_minimum_required(VERSION 3.8) project(Retro) set(CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_STANDARD_REQUIRED TRUE) diff --git a/Elf2Mac/CMakeLists.txt b/Elf2Mac/CMakeLists.txt index a46de9dbca..372623e11e 100644 --- a/Elf2Mac/CMakeLists.txt +++ b/Elf2Mac/CMakeLists.txt @@ -15,8 +15,6 @@ # You should have received a copy of the GNU General Public License # along with Retro68. If not, see . -cmake_minimum_required(VERSION 3.1) - find_package(Boost COMPONENTS REQUIRED) add_executable(Elf2Mac diff --git a/ResourceFiles/CMakeLists.txt b/ResourceFiles/CMakeLists.txt index d66d170001..6458ee4e77 100644 --- a/ResourceFiles/CMakeLists.txt +++ b/ResourceFiles/CMakeLists.txt @@ -15,8 +15,6 @@ # You should have received a copy of the GNU General Public License # along with Retro68. If not, see . -cmake_minimum_required(VERSION 2.8) - find_package(Boost COMPONENTS filesystem system REQUIRED) add_library(ResourceFiles diff --git a/Rez/CMakeLists.txt b/Rez/CMakeLists.txt index 9121723eab..02da3efc5f 100644 --- a/Rez/CMakeLists.txt +++ b/Rez/CMakeLists.txt @@ -15,8 +15,6 @@ # You should have received a copy of the GNU General Public License # along with Retro68. If not, see . -cmake_minimum_required(VERSION 2.8) - find_package(Boost COMPONENTS wave filesystem system thread regex program_options) # Look for bison. diff --git a/Samples/Dialog/CMakeLists.txt b/Samples/Dialog/CMakeLists.txt index b7f57114b0..8718e9381a 100644 --- a/Samples/Dialog/CMakeLists.txt +++ b/Samples/Dialog/CMakeLists.txt @@ -21,8 +21,6 @@ # cmake .. -DCMAKE_TOOLCHAIN_FILE=path/to/Retro68-build/toolchain/m68k-apple-macos/cmake/retro68.toolchain.cmake # make -cmake_minimum_required(VERSION 2.8) - add_application(Dialog dialog.c dialog.r diff --git a/Samples/HelloWorld/CMakeLists.txt b/Samples/HelloWorld/CMakeLists.txt index b69d2e22f6..65ad0a59a4 100644 --- a/Samples/HelloWorld/CMakeLists.txt +++ b/Samples/HelloWorld/CMakeLists.txt @@ -4,8 +4,6 @@ # cmake .. -DCMAKE_TOOLCHAIN_FILE=path/to/Retro68-build/toolchain/m68k-apple-macos/cmake/retro68.toolchain.cmake # make -cmake_minimum_required(VERSION 2.8) - add_application(HelloWorld hello.c CONSOLE diff --git a/Samples/Launcher/CMakeLists.txt b/Samples/Launcher/CMakeLists.txt index 55618fd7f9..c1c41be524 100644 --- a/Samples/Launcher/CMakeLists.txt +++ b/Samples/Launcher/CMakeLists.txt @@ -1,5 +1,3 @@ -cmake_minimum_required(VERSION 2.8) - set(CMAKE_C_FLAGS "-Wno-multichar") set(CMAKE_EXE_LINKER_FLAGS "-Wl,-gc-sections") diff --git a/Samples/Raytracer/CMakeLists.txt b/Samples/Raytracer/CMakeLists.txt index 25ec891081..9c3002e7fd 100644 --- a/Samples/Raytracer/CMakeLists.txt +++ b/Samples/Raytracer/CMakeLists.txt @@ -21,8 +21,6 @@ # cmake .. -DCMAKE_TOOLCHAIN_FILE=path/to/Retro68-build/toolchain/m68k-apple-macos/cmake/retro68.toolchain.cmake # make -cmake_minimum_required(VERSION 2.8) - if(APPLE) add_executable(Raytracer MACOSX_BUNDLE raytracer.c diff --git a/Samples/WDEF/CMakeLists.txt b/Samples/WDEF/CMakeLists.txt index 30e96f152b..adb2e73071 100644 --- a/Samples/WDEF/CMakeLists.txt +++ b/Samples/WDEF/CMakeLists.txt @@ -21,8 +21,6 @@ # cmake .. -DCMAKE_TOOLCHAIN_FILE=path/to/Retro68-build/toolchain/cmake/retro68.toolchain.cmake # make -cmake_minimum_required(VERSION 2.8) - # This sample program contains a custom window definition procedure (WDEF) defined in wdef.c. # It is used in two different ways: # 1. The 80s way: compiled as a separate 'WDEF' code resource. diff --git a/TestApps/CMakeLists.txt b/TestApps/CMakeLists.txt index dced83c337..a678f274ab 100644 --- a/TestApps/CMakeLists.txt +++ b/TestApps/CMakeLists.txt @@ -15,8 +15,6 @@ # You should have received a copy of the GNU General Public License # along with Retro68. If not, see . -cmake_minimum_required(VERSION 2.8) - add_application(EmptyTest EmptyTest.c) add_application(ExceptionTest CONSOLE ExceptionTest.cc) diff --git a/libretro/CMakeLists.txt b/libretro/CMakeLists.txt index 339a112bfd..ea46fdde5e 100644 --- a/libretro/CMakeLists.txt +++ b/libretro/CMakeLists.txt @@ -21,8 +21,6 @@ # see the files COPYING and COPYING.RUNTIME respectively. If not, see # . -cmake_minimum_required(VERSION 2.8) - if(CMAKE_SYSTEM_NAME MATCHES Retro68) find_program(CONVERT_OBJ ConvertObj PATH "${CMAKE_INSTALL_PREFIX}/../bin/")