Skip to content

Commit faae381

Browse files
committed
[cmake,format] reformat all cmake files
1 parent de98cde commit faae381

File tree

402 files changed

+6643
-7928
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

402 files changed

+6643
-7928
lines changed

CMakeCPack.cmake

+24-28
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,32 @@
1-
21
# Generate .txt license file for CPack (PackageMaker requires a file extension)
32
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/LICENSE ${CMAKE_CURRENT_BINARY_DIR}/LICENSE.txt @ONLY)
43

54
# Workaround to remove c++ compiler macros and defines for Eclipse.
65
# If c++ macros/defines are set __cplusplus is also set which causes
76
# problems when compiling freerdp/jni. To prevent this problem we set the macros to "".
87

9-
if (ANDROID AND CMAKE_EXTRA_GENERATOR STREQUAL "Eclipse CDT4")
10-
set(CMAKE_EXTRA_GENERATOR_CXX_SYSTEM_DEFINED_MACROS "")
11-
message(STATUS "Disabled CXX system defines for eclipse (workaround).")
8+
if(ANDROID AND CMAKE_EXTRA_GENERATOR STREQUAL "Eclipse CDT4")
9+
set(CMAKE_EXTRA_GENERATOR_CXX_SYSTEM_DEFINED_MACROS "")
10+
message(STATUS "Disabled CXX system defines for eclipse (workaround).")
1211
endif()
1312

1413
set(CPACK_SOURCE_IGNORE_FILES "/\\\\.git/;/\\\\.gitignore;/CMakeCache.txt")
1514

1615
if(NOT WIN32)
17-
if(APPLE AND (NOT IOS))
18-
19-
if(WITH_SERVER)
20-
set(CPACK_PACKAGE_EXECUTABLES ${CPACK_PACKAGE_EXECUTABLES} "mfreerdp-server")
21-
endif()
22-
endif()
23-
24-
if(WITH_X11)
25-
set(CPACK_PACKAGE_EXECUTABLES "xfreerdp")
26-
27-
if(WITH_SERVER)
28-
set(CPACK_PACKAGE_EXECUTABLES ${CPACK_PACKAGE_EXECUTABLES} "xfreerdp-server")
29-
endif()
16+
if(APPLE AND (NOT IOS))
17+
18+
if(WITH_SERVER)
19+
set(CPACK_PACKAGE_EXECUTABLES ${CPACK_PACKAGE_EXECUTABLES} "mfreerdp-server")
20+
endif()
21+
endif()
22+
23+
if(WITH_X11)
24+
set(CPACK_PACKAGE_EXECUTABLES "xfreerdp")
25+
26+
if(WITH_SERVER)
27+
set(CPACK_PACKAGE_EXECUTABLES ${CPACK_PACKAGE_EXECUTABLES} "xfreerdp-server")
3028
endif()
29+
endif()
3130
endif()
3231

3332
set(CPACK_SYSTEM_NAME "${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}")
@@ -43,7 +42,7 @@ set(CPACK_PACKAGE_VERSION ${FREERDP_VERSION_FULL})
4342
set(CPACK_PACKAGE_VERSION_MAJOR ${FREERDP_VERSION_MAJOR})
4443
set(CPACK_PACKAGE_VERSION_MINOR ${FREERDP_VERSION_MINOR})
4544
set(CPACK_PACKAGE_VERSION_PATCH ${FREERDP_VERSION_REVISION})
46-
SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "FreeRDP: A Remote Desktop Protocol Implementation")
45+
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "FreeRDP: A Remote Desktop Protocol Implementation")
4746

4847
set(CPACK_PACKAGE_CONTACT "Marc-Andre Moreau")
4948
set(CPACK_DEBIAN_PACKAGE_MAINTAINER "marcandre.moreau@gmail.com")
@@ -61,16 +60,14 @@ set(CPACK_NSIS_MUI_UNICON "${PROJECT_SOURCE_DIR}/resource\\\\FreeRDP_Icon_96px.i
6160
set(CPACK_COMPONENTS_ALL client server libraries headers symbols tools)
6261

6362
if(MSVC)
64-
string(FIND ${CMAKE_MSVC_RUNTIME_LIBRARY} "DLL" IS_SHARED)
63+
string(FIND ${CMAKE_MSVC_RUNTIME_LIBRARY} "DLL" IS_SHARED)
6564

66-
if(NOT IS_SHARED STREQUAL "-1")
67-
set(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP TRUE)
68-
include(InstallRequiredSystemLibraries)
65+
if(NOT IS_SHARED STREQUAL "-1")
66+
set(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP TRUE)
67+
include(InstallRequiredSystemLibraries)
6968

70-
install(PROGRAMS ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS}
71-
DESTINATION ${CMAKE_INSTALL_BINDIR}
72-
COMPONENT libraries)
73-
endif()
69+
install(PROGRAMS ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS} DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT libraries)
70+
endif()
7471
endif()
7572

7673
set(CPACK_COMPONENT_CLIENT_DISPLAY_NAME "Client")
@@ -95,8 +92,7 @@ set(CPACK_COMPONENT_GROUP_RUNTIME_DESCRIPTION "Runtime")
9592
set(CPACK_COMPONENT_GROUP_APPLICATIONS_DESCRIPTION "Applications")
9693
set(CPACK_COMPONENT_GROUP_DEVELOPMENT_DESCRIPTION "Development")
9794

98-
configure_file("${PROJECT_SOURCE_DIR}/CMakeCPackOptions.cmake.in"
99-
"${PROJECT_BINARY_DIR}/CMakeCPackOptions.cmake" @ONLY)
95+
configure_file("${PROJECT_SOURCE_DIR}/CMakeCPackOptions.cmake.in" "${PROJECT_BINARY_DIR}/CMakeCPackOptions.cmake" @ONLY)
10096
set(CPACK_PROJECT_CONFIG_FILE "${PROJECT_BINARY_DIR}/CMakeCPackOptions.cmake")
10197

10298
include(CPack)

0 commit comments

Comments
 (0)