aboutsummaryrefslogtreecommitdiffhomepage
path: root/CMakeLists.txt
diff options
context:
space:
mode:
authorGravatar archshift <admin@archshift.com>2014-05-19 15:19:36 -0700
committerGravatar archshift <admin@archshift.com>2014-05-19 15:19:36 -0700
commit403e4bf837c47c7e10dc006fafffea8c160c890f (patch)
tree40e17e39c19fbedd6903d4985950c23d785b27b7 /CMakeLists.txt
parent71b8789803e801dae6eae081c741523c62e071cd (diff)
CMakeLists: rename HEADS, improved comments
Changes for clarity of comments, removed redundant compiler flags.
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt5
1 files changed, 2 insertions, 3 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)