]> git.ipfire.org Git - thirdparty/dbus.git/commitdiff
Remove spaces between cmake command and opening bracket
authorRalf Habacker <ralf.habacker@freenet.de>
Mon, 21 Jan 2019 18:37:46 +0000 (19:37 +0100)
committerRalf Habacker <ralf.habacker@freenet.de>
Wed, 23 Jan 2019 20:34:24 +0000 (21:34 +0100)
cmake/ConfigureChecks.cmake
cmake/modules/CPackInstallConfig.cmake
cmake/modules/Macros.cmake
cmake/modules/MacrosAutotools.cmake
cmake/modules/Win32Macros.cmake

index 21346a24eec77bf7fd4e1f688aed6a0031645a4a..b64a7d3f81be027c6ee7e4529b47c51acb6798d6 100644 (file)
@@ -169,39 +169,39 @@ set(CMAKE_EXTRA_INCLUDE_FILES)
 
 # DBUS_INT64_TYPE
 if(SIZEOF_INT EQUAL 8)
-    set (DBUS_INT64_TYPE "int")
-    set (DBUS_INT64_CONSTANT  "(val)")
-    set (DBUS_UINT64_CONSTANT "(val##U)")
+    set(DBUS_INT64_TYPE "int")
+    set(DBUS_INT64_CONSTANT  "(val)")
+    set(DBUS_UINT64_CONSTANT "(val##U)")
 elseif(SIZEOF_LONG EQUAL 8)
-    set (DBUS_INT64_TYPE "long")
-    set (DBUS_INT64_CONSTANT  "(val##L)")
-    set (DBUS_UINT64_CONSTANT "(val##UL)")
+    set(DBUS_INT64_TYPE "long")
+    set(DBUS_INT64_CONSTANT  "(val##L)")
+    set(DBUS_UINT64_CONSTANT "(val##UL)")
 elseif(SIZEOF_LONG_LONG EQUAL 8)
-    set (DBUS_INT64_TYPE "long long")
-    set (DBUS_INT64_CONSTANT  "(val##LL)")
-    set (DBUS_UINT64_CONSTANT "(val##ULL)")
+    set(DBUS_INT64_TYPE "long long")
+    set(DBUS_INT64_CONSTANT  "(val##LL)")
+    set(DBUS_UINT64_CONSTANT "(val##ULL)")
 elseif(SIZEOF___INT64 EQUAL 8)
-    set (DBUS_INT64_TYPE "__int64")
-    set (DBUS_INT64_CONSTANT  "(val##i64)")
-    set (DBUS_UINT64_CONSTANT "(val##ui64)")
+    set(DBUS_INT64_TYPE "__int64")
+    set(DBUS_INT64_CONSTANT  "(val##i64)")
+    set(DBUS_UINT64_CONSTANT "(val##ui64)")
 else(SIZEOF_INT EQUAL 8)
-    message (FATAL_ERROR "Could not find a 64-bit integer type")
+    message(FATAL_ERROR "Could not find a 64-bit integer type")
 endif(SIZEOF_INT EQUAL 8)
 
 # DBUS_INT32_TYPE
 if(SIZEOF_INT EQUAL 4)
-    set (DBUS_INT32_TYPE "int")
+    set(DBUS_INT32_TYPE "int")
 elseif(SIZEOF_LONG EQUAL 4)
-    set (DBUS_INT32_TYPE "long")
+    set(DBUS_INT32_TYPE "long")
 elseif(SIZEOF_LONG_LONG EQUAL 4)
-    set (DBUS_INT32_TYPE "long long")
+    set(DBUS_INT32_TYPE "long long")
 endif(SIZEOF_INT EQUAL 4)
 
 # DBUS_INT16_TYPE
 if(SIZEOF_INT EQUAL 2)
-    set (DBUS_INT16_TYPE "int")
+    set(DBUS_INT16_TYPE "int")
 elseif(SIZEOF_SHORT EQUAL 2)
-    set (DBUS_INT16_TYPE "short")
+    set(DBUS_INT16_TYPE "short")
 endif(SIZEOF_INT EQUAL 2)
 
 find_program(DOXYGEN doxygen)
index aa8285efbb162d39971d35db3decb8a9650467bb..6bac749ac0f2f2c9170e16724c93717662c4cdc4 100644 (file)
@@ -1,11 +1,11 @@
 
-if (DBUS_INSTALL_SYSTEM_LIBS)
-    if (MINGW)
-    else (MINGW)
+if(DBUS_INSTALL_SYSTEM_LIBS)
+    if(MINGW)
+    else(MINGW)
         include(InstallRequiredSystemLibraries)
-    endif (MINGW)
+    endif(MINGW)
         install(FILES ${LIBEXPAT_LIBRARIES} DESTINATION ${CMAKE_INSTALL_BINDIR})
-endif (DBUS_INSTALL_SYSTEM_LIBS)
+endif(DBUS_INSTALL_SYSTEM_LIBS)
 
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "D-BUS For Windows")
 set(CPACK_PACKAGE_VENDOR "D-BUS Windows Team")
index 1d613067fde2bb743b204369cceb7216ac6bce95..8397bcf09621852e1ec429549bb2cd0d94720db7 100644 (file)
@@ -46,7 +46,7 @@ macro(add_test_executable _target _source)
     endif()
     add_executable(${_target} ${_sources})
     target_link_libraries(${_target} ${ARGN})
-    if (CMAKE_CROSSCOMPILING AND CMAKE_SYSTEM_NAME STREQUAL "Windows")
+    if(CMAKE_CROSSCOMPILING AND CMAKE_SYSTEM_NAME STREQUAL "Windows")
         # run tests with binfmt_misc
         if(HAVE_BINFMT_WINE_SUPPORT)
             add_test(NAME ${_target} COMMAND $<TARGET_FILE:${_target}> --tap)
index 1f9b942c2a69b5d510bcfcef5a958b86d9908595..147d19b0bd8ffcc466fe6675afea07c3845a8591 100644 (file)
@@ -31,14 +31,14 @@ endmacro()
 # 
 macro(autoversion prefix)
     string(TOUPPER ${prefix} prefix_upper)
-    string (REGEX REPLACE ".*${prefix}_major_version], .([0-9]+).*" "\\1" ${prefix_upper}_MAJOR_VERSION ${_configure_ac_raw})
-    string (REGEX REPLACE ".*${prefix}_minor_version], .([0-9]+).*" "\\1" ${prefix_upper}_MINOR_VERSION ${_configure_ac_raw})
-    string (REGEX REPLACE ".*${prefix}_micro_version], .([0-9]+).*" "\\1" ${prefix_upper}_MICRO_VERSION ${_configure_ac_raw})
-    set (${prefix_upper}_VERSION ${${prefix_upper}_MAJOR_VERSION}.${${prefix_upper}_MINOR_VERSION}.${${prefix_upper}_MICRO_VERSION})
-    set (${prefix_upper}_VERSION_STRING "${${prefix_upper}_VERSION}")
-    string (REGEX REPLACE ".*LT_AGE=([0-9]+).*" "\\1" ${prefix_upper}_LIBRARY_AGE ${_configure_ac_raw})
-    string (REGEX REPLACE ".*LT_CURRENT=([0-9]+).*" "\\1" ${prefix_upper}_LIBRARY_CURRENT ${_configure_ac_raw})
-    string (REGEX REPLACE ".*LT_REVISION=([0-9]+).*" "\\1" ${prefix_upper}_LIBRARY_REVISION ${_configure_ac_raw})
+    string(REGEX REPLACE ".*${prefix}_major_version], .([0-9]+).*" "\\1" ${prefix_upper}_MAJOR_VERSION ${_configure_ac_raw})
+    string(REGEX REPLACE ".*${prefix}_minor_version], .([0-9]+).*" "\\1" ${prefix_upper}_MINOR_VERSION ${_configure_ac_raw})
+    string(REGEX REPLACE ".*${prefix}_micro_version], .([0-9]+).*" "\\1" ${prefix_upper}_MICRO_VERSION ${_configure_ac_raw})
+    set(${prefix_upper}_VERSION ${${prefix_upper}_MAJOR_VERSION}.${${prefix_upper}_MINOR_VERSION}.${${prefix_upper}_MICRO_VERSION})
+    set(${prefix_upper}_VERSION_STRING "${${prefix_upper}_VERSION}")
+    string(REGEX REPLACE ".*LT_AGE=([0-9]+).*" "\\1" ${prefix_upper}_LIBRARY_AGE ${_configure_ac_raw})
+    string(REGEX REPLACE ".*LT_CURRENT=([0-9]+).*" "\\1" ${prefix_upper}_LIBRARY_CURRENT ${_configure_ac_raw})
+    string(REGEX REPLACE ".*LT_REVISION=([0-9]+).*" "\\1" ${prefix_upper}_LIBRARY_REVISION ${_configure_ac_raw})
 endmacro()
 
 #
@@ -107,10 +107,10 @@ endmacro(autopackage)
 macro(autodefine name)
     foreach(line ${_configure_ac})
         if(line MATCHES ".*AC_DEFINE(.*${name}.*).*")
-            string (REGEX REPLACE ".*AC_DEFINE(.*).*" "\\1" value ${line})
-            string (REGEX REPLACE "[^[]*\\[[^]]*\\], *\\[([^]]*)\\],.*" "\\1" value2 ${value})
-            string (REPLACE "[" "" value3 ${value2})
-            string (REPLACE "]" "" value4 ${value3})
+            string(REGEX REPLACE ".*AC_DEFINE(.*).*" "\\1" value ${line})
+            string(REGEX REPLACE "[^[]*\\[[^]]*\\], *\\[([^]]*)\\],.*" "\\1" value2 ${value})
+            string(REPLACE "[" "" value3 ${value2})
+            string(REPLACE "]" "" value4 ${value3})
             set(${name} ${value4})
         endif()
     endforeach()
@@ -125,7 +125,7 @@ macro(autoheaderchecks config_h_in configure_checks_file config_h_cmake)
     foreach(line ${_config_h_in})
         #message(STATUS ${line})
         if(line MATCHES ".*HAVE_.*_H.*")
-            string (REGEX REPLACE ".*HAVE_(.*)_H.*" "\\1" key ${line})
+            string(REGEX REPLACE ".*HAVE_(.*)_H.*" "\\1" key ${line})
             set(full_key "HAVE_${key}_H")
             if(key MATCHES ".*_.*")
                 string(REGEX MATCH "^[A-Z0-9]+" dir ${key})
index a95727614ddb00eadeda3d154d8183ef5cf352c1..c8402e49225a1c1d6f9d5a42f75f49ad05dd3dc4 100644 (file)
@@ -6,7 +6,7 @@
 # Redistribution and use is allowed according to the terms of the BSD license.
 #
 
-if (WIN32)
+if(WIN32)
     #
     # addExplorerWrapper creates batch files for fast access 
     # to the build environment from the win32 explorer. 
@@ -19,26 +19,26 @@ if (WIN32)
     macro(addExplorerWrapper _projectname)
         # write explorer wrappers
         get_filename_component(CMAKE_BIN_PATH ${CMAKE_COMMAND} PATH)
-        set (ADD_PATH "${CMAKE_BIN_PATH}")
+        set(ADD_PATH "${CMAKE_BIN_PATH}")
 
-        if (QT_QMAKE_EXECUTABLE)
+        if(QT_QMAKE_EXECUTABLE)
             get_filename_component(QT_BIN_PATH ${QT_QMAKE_EXECUTABLE} PATH)
-            set (ADD_PATH "${ADD_PATH};${QT_BIN_PATH}")
-        endif (QT_QMAKE_EXECUTABLE)
+            set(ADD_PATH "${ADD_PATH};${QT_BIN_PATH}")
+        endif(QT_QMAKE_EXECUTABLE)
 
         # add here more pathes 
 
-        if (MINGW)
+        if(MINGW)
             get_filename_component(MINGW_BIN_PATH ${CMAKE_CXX_COMPILER} PATH)
-            set (ADD_PATH "${ADD_PATH};${MINGW_BIN_PATH}")
-            write_file (${CMAKE_BINARY_DIR}/${_projectname}-shell.bat "set PATH=${ADD_PATH};%PATH%\ncmd.exe")
-        else (MINGW)
-            if (CMAKE_BUILD_TOOL STREQUAL  "nmake")
+            set(ADD_PATH "${ADD_PATH};${MINGW_BIN_PATH}")
+            write_file(${CMAKE_BINARY_DIR}/${_projectname}-shell.bat "set PATH=${ADD_PATH};%PATH%\ncmd.exe")
+        else(MINGW)
+            if(CMAKE_BUILD_TOOL STREQUAL  "nmake")
                 get_filename_component(VC_BIN_PATH ${CMAKE_CXX_COMPILER} PATH)
-                write_file (${CMAKE_BINARY_DIR}/${_projectname}-shell.bat "set PATH=${ADD_PATH};%PATH%\ncall \"${VC_BIN_PATH}\\vcvars32.bat\"\ncmd.exe")
-            else (CMAKE_BUILD_TOOL STREQUAL  "nmake")
-                write_file (${CMAKE_BINARY_DIR}/${_projectname}-sln.bat "set PATH=${ADD_PATH};%PATH%\nstart ${_projectname}.sln")
-            endif (CMAKE_BUILD_TOOL STREQUAL  "nmake")
-        endif (MINGW)
+                write_file(${CMAKE_BINARY_DIR}/${_projectname}-shell.bat "set PATH=${ADD_PATH};%PATH%\ncall \"${VC_BIN_PATH}\\vcvars32.bat\"\ncmd.exe")
+            else(CMAKE_BUILD_TOOL STREQUAL  "nmake")
+                write_file(${CMAKE_BINARY_DIR}/${_projectname}-sln.bat "set PATH=${ADD_PATH};%PATH%\nstart ${_projectname}.sln")
+            endif(CMAKE_BUILD_TOOL STREQUAL  "nmake")
+        endif(MINGW)
     endmacro(addExplorerWrapper)
 endif(WIN32)