Move C and C++ flags override to laf library

i0x0 · Mar 2, 2020 · 00fa254 · 00fa254
1 parent d86bbcc
commit 00fa254
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 20 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,5 @@
 # Aseprite
+# Copyright (C) 2018-2020  Igara Studio S.A.
 # Copyright (C) 2001-2018  David Capello
 
 cmake_minimum_required(VERSION 3.4)
@@ -23,13 +24,6 @@ if(NOT CMAKE_BUILD_TYPE)
       FORCE)
 endif()
 
-# Restrict configuration types to the selected build type.
-# Note: This needs to be done before the project command
-set(CMAKE_CONFIGURATION_TYPES "${CMAKE_BUILD_TYPE}" CACHE INTERNAL "internal")
-
-set(CMAKE_USER_MAKE_RULES_OVERRIDE ${CMAKE_CURRENT_SOURCE_DIR}/cmake/c_flag_overrides.cmake)
-set(CMAKE_USER_MAKE_RULES_OVERRIDE_CXX ${CMAKE_CURRENT_SOURCE_DIR}/cmake/cxx_flag_overrides.cmake)
-
 # Aseprite project
 project(aseprite C CXX)
 

diff --git a/cmake/c_flag_overrides.cmake b/cmake/c_flag_overrides.cmake
diff --git a/cmake/cxx_flag_overrides.cmake b/cmake/cxx_flag_overrides.cmake
diff --git a/laf b/laf
+6 −1		CMakeLists.txt
+6 −0		cmake/c_flag_overrides.cmake
+6 −0		cmake/cxx_flag_overrides.cmake