From b647b5bfc92da74bcc6d5b0f01dafc5ae2c500ae Mon Sep 17 00:00:00 2001 From: Bernhard Miklautz Date: Tue, 24 Sep 2013 01:41:18 +0200 Subject: [PATCH] some CMakeLists format fixes --- CMakeLists.txt | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 85446b9da..0a6e0f26c 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -204,7 +204,7 @@ if(WIN32) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DUNICODE -D_UNICODE") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_WIN32_WINNT=0x0501") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_CRT_SECURE_NO_WARNINGS") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DWIN32_LEAN_AND_MEAN") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DWIN32_LEAN_AND_MEAN") endif() if(IOS) @@ -240,26 +240,26 @@ endif() # Mac OS X if(APPLE) - if(IOS) - if (NOT FREERDP_IOS_EXTERNAL_SSL_PATH) - message(STATUS "FREERDP_IOS_EXTERNAL_SSL_PATH not set! Required if openssl is not found in the iOS SDK (which usually isn't") - endif() - set(CMAKE_FIND_ROOT_PATH ${CMAKE_FIND_ROOT_PATH} ${FREERDP_IOS_EXTERNAL_SSL_PATH}) - set_property(GLOBAL PROPERTY XCODE_ATTRIBUTE_SKIP_INSTALL YES) - else() + if(IOS) + if (NOT FREERDP_IOS_EXTERNAL_SSL_PATH) + message(STATUS "FREERDP_IOS_EXTERNAL_SSL_PATH not set! Required if openssl is not found in the iOS SDK (which usually isn't") + endif() + set(CMAKE_FIND_ROOT_PATH ${CMAKE_FIND_ROOT_PATH} ${FREERDP_IOS_EXTERNAL_SSL_PATH}) + set_property(GLOBAL PROPERTY XCODE_ATTRIBUTE_SKIP_INSTALL YES) + else(IOS) if(NOT DEFINED CMAKE_OSX_DEPLOYMENT_TARGET OR CMAKE_OSX_DEPLOYMENT_TARGET MATCHES "") - set(CMAKE_OSX_DEPLOYMENT_TARGET 10.7 CACHE STRING "OSX deployment target" FORCE) + set(CMAKE_OSX_DEPLOYMENT_TARGET 10.7 CACHE STRING "OSX deployment target" FORCE) endif() if(NOT DEFINED CMAKE_OSX_ARCHITECTURES) set(CMAKE_OSX_ARCHITECTURES i386 x86_64) endif() - if(IS_DIRECTORY /opt/local/include) - include_directories(/opt/local/include) - link_directories(/opt/local/lib) - endif() - endif() + if(IS_DIRECTORY /opt/local/include) + include_directories(/opt/local/include) + link_directories(/opt/local/lib) + endif() + endif(IOS) # Temporarily disabled, causes the cmake script to be reexecuted, causing the compilation to fail. # Workaround: specify the parameter in the command-line @@ -267,11 +267,11 @@ if(APPLE) # set(CMAKE_C_COMPILER "clang") # endif() - if (WITH_VERBOSE) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -v") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -v") - endif() -endif() + if (WITH_VERBOSE) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -v") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -v") + endif() +endif(APPLE) # Android if(ANDROID)