From eb07c005e39433a514fbd648fc39f5dc28a2f9db Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Fri, 25 Jan 2013 13:55:05 -0600 Subject: [PATCH] Move the cmake option lines to the top of the Cmake file for easy viewing in vim. --- CMakeLists.txt | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 255e3c95eb..8efd8c495d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,6 +3,19 @@ # cmake_minimum_required(VERSION 2.6) +option(USE_GLES "Enables GLES, disables OGL" OFF) +option(DISABLE_WX "Disable wxWidgets (use CLI interface)" OFF) + +option(FASTLOG "Enable all logs" OFF) +option(OPROFILING "Enable profiling" OFF) +option(OPENMP "Enable OpenMP parallelization" ON) +option(ENCODE_FRAMEDUMPS "Encode framedumps in AVI format" ON) +######################################## +# Optional Targets +# TODO: Add DSPSpy and TestSuite. +option(DSPTOOL "Build dsptool" OFF) +option(UNITTESTS "Build unitests" OFF) + # Update compiler before calling project() if (APPLE) # Use clang compiler @@ -217,14 +230,12 @@ if(CMAKE_BUILD_TYPE STREQUAL Release) add_definitions(-fomit-frame-pointer) endif(CMAKE_BUILD_TYPE STREQUAL Release) -option(FASTLOG "Enable all logs" OFF) if(FASTLOG) add_definitions(-DDEBUGFAST) endif() # For now GLES and EGL are tied to each other. # Enabling GLES also disables the OpenGL plugin. -option(USE_GLES "Enables GLES, disables OGL" OFF) if(USE_GLES) message("GLES rendering enabled") add_definitions(-DUSE_GLES) @@ -248,7 +259,6 @@ if(NOT OPENGL_GLU_FOUND) message(FATAL_ERROR "GLU is required but not found") endif() -option(OPENMP "Enable OpenMP parallelization" ON) if(OPENMP) include(FindOpenMP OPTIONAL) if(OPENMP_FOUND) @@ -331,7 +341,6 @@ else() add_definitions(-DHAVE_XRANDR=0) endif(XRANDR_FOUND) -option(ENCODE_FRAMEDUMPS "Encode framedumps in AVI format" ON) if(ENCODE_FRAMEDUMPS) check_libav() endif() @@ -353,7 +362,6 @@ else() set(PORTAUDIO_FOUND FALSE) endif(PORTAUDIO) -option(OPROFILING "Enable profiling" OFF) if(OPROFILING) check_lib(OPROFILE opagent opagent.h) check_lib(BFD bfd bfd.h) @@ -511,7 +519,6 @@ else() add_subdirectory(Externals/CLRun) endif() -option(DISABLE_WX "Disable wxWidgets (use CLI interface)" OFF) if(NOT DISABLE_WX) include(FindwxWidgets OPTIONAL) FIND_PACKAGE(wxWidgets COMPONENTS core aui adv) @@ -607,12 +614,6 @@ file(WRITE ${PROJECT_BINARY_DIR}/Source/Core/Common/Src/scmrev.h ) include_directories("${PROJECT_BINARY_DIR}/Source/Core/Common/Src") -######################################## -# Optional Targets -# TODO: Add DSPSpy and TestSuite. -option(DSPTOOL "Build dsptool" OFF) -option(UNITTESTS "Build unitests" OFF) - ######################################## # Start compiling our code #