From dceddc8ac4f3de17dd291668d13cd989ec228397 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Fri, 7 Mar 2014 11:12:53 -0800 Subject: [PATCH] repair indentation in root CMakeLists --- CMakeLists.txt | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d064226b6e..1def2e1136 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,14 +2,14 @@ cmake_minimum_required(VERSION 2.8) project(hifi) -IF (WIN32) - add_definitions( -DNOMINMAX -D_CRT_SECURE_NO_WARNINGS ) - set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} "C:\\Program Files\\Microsoft SDKs\\Windows\\v7.1 ") -ELSEIF (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX) - #SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-long-long -pedantic") - #SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-unknown-pragmas") - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall") -ENDIF(WIN32) +if (WIN32) + add_definitions(-DNOMINMAX -D_CRT_SECURE_NO_WARNINGS) + set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} "C:\\Program Files\\Microsoft SDKs\\Windows\\v7.1 ") +elseif (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX) + #SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-long-long -pedantic") + #SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-unknown-pragmas") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall") +endif(WIN32) set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} $ENV{QT_CMAKE_PREFIX_PATH}) @@ -22,17 +22,17 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON) # Instruct CMake to run moc automatically when needed. set(CMAKE_AUTOMOC ON) -IF (APPLE) - EXEC_PROGRAM(uname ARGS -v OUTPUT_VARIABLE DARWIN_VERSION) - STRING(REGEX MATCH "[0-9]+" DARWIN_VERSION ${DARWIN_VERSION}) - IF (DARWIN_VERSION GREATER 12) - SET(CMAKE_CXX_FLAGS "-stdlib=libstdc++") - ENDIF (DARWIN_VERSION GREATER 12) -ENDIF(APPLE) +if (APPLE) + exec_program(uname ARGS -v OUTPUT_VARIABLE DARWIN_VERSION) + string(REGEX MATCH "[0-9]+" DARWIN_VERSION ${DARWIN_VERSION}) + if (DARWIN_VERSION GREATER 12) + set(CMAKE_CXX_FLAGS "-stdlib=libstdc++") + endif (DARWIN_VERSION GREATER 12) +endif (APPLE) # targets not supported on windows if (NOT WIN32) -add_subdirectory(animation-server) + add_subdirectory(animation-server) endif (NOT WIN32) # targets on all platforms