From 403e4bf837c47c7e10dc006fafffea8c160c890f Mon Sep 17 00:00:00 2001
From: archshift <admin@archshift.com>
Date: Mon, 19 May 2014 15:19:36 -0700
Subject: CMakeLists: rename HEADS, improved comments

Changes for clarity of comments, removed redundant compiler flags.
---
 CMakeLists.txt                | 5 ++---
 src/citra/CMakeLists.txt      | 4 ++--
 src/citra_qt/CMakeLists.txt   | 4 ++--
 src/common/CMakeLists.txt     | 4 ++--
 src/core/CMakeLists.txt       | 4 ++--
 src/video_core/CMakeLists.txt | 4 ++--
 6 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b4665640..76190c5e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,8 +3,6 @@ cmake_minimum_required(VERSION 2.6)
 project(citra)
 
 SET(CMAKE_CXX_FLAGS "-std=c++11 -fpermissive")
-SET(CMAKE_CXX_FLAGS_DEBUG "-std=c++11 -fpermissive")
-SET(CMAKE_CXX_FLAGS_RELEASE "-std=c++11 -fpermissive")
 
 # silence some spam
 add_definitions(-Wno-attributes)
@@ -20,6 +18,7 @@ find_package(GLEW REQUIRED)
 find_package(OpenGL REQUIRED)
 pkg_search_module(GLFW REQUIRED glfw3)
 
+# corefoundation is required only on OSX
 IF (APPLE)
     FIND_LIBRARY(COREFOUNDATION_LIBRARY CoreFoundation)
     SET(CMAKE_CXX_FLAGS "-stdlib=libc++")
@@ -31,7 +30,7 @@ include_directories(${GLFW_INCLUDE_DIRS})
 include_directories(${OPENGL_INCLUDE_DIR})
 include_directories(${GLEW_INCLUDE_DIR})
 
-#use pkg_search_module library dirs
+# workaround for GLFW linking on OSX
 link_directories(${GLFW_LIBRARY_DIRS})
 
 option(DISABLE_QT4 "Disable Qt4 GUI" OFF)
diff --git a/src/citra/CMakeLists.txt b/src/citra/CMakeLists.txt
index 7787d6a7..1ad607d7 100644
--- a/src/citra/CMakeLists.txt
+++ b/src/citra/CMakeLists.txt
@@ -1,6 +1,6 @@
 set(SRCS    citra.cpp
             emu_window/emu_window_glfw.cpp)
-set(HEADS   citra.h
+set(HEADERS citra.h
             resource.h)
 
 # NOTE: This is a workaround for CMake bug 0006976 (missing X11_xf86vmode_LIB variable)
@@ -8,7 +8,7 @@ if (NOT X11_xf86vmode_LIB)
     set(X11_xv86vmode_LIB Xxf86vm)
 endif()
 
-add_executable(citra ${SRCS} ${HEADS})
+add_executable(citra ${SRCS} ${HEADERS})
 
 if (APPLE)
     target_link_libraries(citra core common video_core iconv pthread ${COREFOUNDATION_LIBRARY} ${OPENGL_LIBRARIES} ${GLEW_LIBRARY} ${GLFW_LIBRARIES})
diff --git a/src/citra_qt/CMakeLists.txt b/src/citra_qt/CMakeLists.txt
index 9d983c0f..549f6921 100644
--- a/src/citra_qt/CMakeLists.txt
+++ b/src/citra_qt/CMakeLists.txt
@@ -8,7 +8,7 @@ set(SRCS
             main.cpp
             config/controller_config.cpp
             config/controller_config_util.cpp)
-set (HEADS
+set (HEADERS
             bootmanager.hxx
             debugger/callstack.hxx
             debugger/disassembler.hxx
@@ -49,7 +49,7 @@ qt4_wrap_cpp(MOC_SRCS
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 include_directories(./)
 
-add_executable(citra-qt ${SRCS} ${HEADS} ${MOC_SRCS} ${UI_HDRS})
+add_executable(citra-qt ${SRCS} ${HEADERS} ${MOC_SRCS} ${UI_HDRS})
 if (APPLE)
     target_link_libraries(citra-qt core common video_core qhexedit iconv ${COREFOUNDATION_LIBRARY} ${QT_LIBRARIES} ${GLEW_LIBRARY} ${OPENGL_LIBRARIES})
 else()
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index 0027ae2b..aae18339 100644
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -19,7 +19,7 @@ set(SRCS    break_points.cpp
             timer.cpp
             utf8.cpp)
 
-set(HEADS   atomic.h
+set(HEADERS atomic.h
             atomic_gcc.h
             atomic_win32.h
             bit_field.h
@@ -58,4 +58,4 @@ set(HEADS   atomic.h
             timer.h
             utf8.h)
 
-add_library(common STATIC ${SRCS} ${HEADS})
+add_library(common STATIC ${SRCS} ${HEADERS})
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index ddf6bf79..14c598bf 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -43,7 +43,7 @@ set(SRCS    core.cpp
             hw/lcd.cpp
             hw/ndma.cpp)
 
-set(HEADS   core.h
+set(HEADERS core.h
             core_timing.h
             loader.h
             mem_map.h
@@ -86,4 +86,4 @@ set(HEADS   core.h
             hw/lcd.h
             hw/ndma.h)
 
-add_library(core STATIC ${SRCS} ${HEADS})
+add_library(core STATIC ${SRCS} ${HEADERS})
diff --git a/src/video_core/CMakeLists.txt b/src/video_core/CMakeLists.txt
index 8d04d381..e43e6e1b 100644
--- a/src/video_core/CMakeLists.txt
+++ b/src/video_core/CMakeLists.txt
@@ -2,9 +2,9 @@ set(SRCS    video_core.cpp
             utils.cpp
             renderer_opengl/renderer_opengl.cpp)
 
-set(HEADS   video_core.h
+set(HEADERS video_core.h
             utils.h
             renderer_base.h
             renderer_opengl/renderer_opengl.h)
 
-add_library(video_core STATIC ${SRCS} ${HEADS})
+add_library(video_core STATIC ${SRCS} ${HEADERS})
-- 
cgit v1.2.3