Mercurial > embed

changeset 17:b63f9c593c90

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
misc: switch to spaces
author David Demelier <markand@malikania.fr>
date Wed, 22 Jun 2016 09:38:51 +0200
parents 8d07ae59ee59
children 0e89df76cd77
files gtest/CMakeLists.txt hoedown/CMakeLists.txt jansson/CMakeLists.txt jsoncpp/CMakeLists.txt pugixml/CMakeLists.txt yaml/CMakeLists.txt
diffstat 6 files changed, 139 insertions(+), 139 deletions(-) [+]
line wrap: on
line diff
--- a/gtest/CMakeLists.txt	Tue May 24 13:59:28 2016 +0200
+++ b/gtest/CMakeLists.txt	Wed Jun 22 09:38:51 2016 +0200
@@ -22,17 +22,17 @@
 add_library(gtest src/gtest-all.cc)
 
 target_include_directories(
-	gtest
-	PUBLIC
-		${GoogleTest_SOURCE_DIR}/include
-	PRIVATE
-		${GoogleTest_SOURCE_DIR}
+    gtest
+    PUBLIC
+        ${GoogleTest_SOURCE_DIR}/include
+    PRIVATE
+        ${GoogleTest_SOURCE_DIR}
 )
 
 if (CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-	target_compile_options(gtest PUBLIC -Wno-missing-field-initializers -Wno-unused-variable)
+    target_compile_options(gtest PUBLIC -Wno-missing-field-initializers -Wno-unused-variable)
 endif ()
 
 if (NOT WIN32)
-	target_link_libraries(gtest -pthread)
+    target_link_libraries(gtest -pthread)
 endif ()
--- a/hoedown/CMakeLists.txt	Tue May 24 13:59:28 2016 +0200
+++ b/hoedown/CMakeLists.txt	Wed Jun 22 09:38:51 2016 +0200
@@ -20,36 +20,36 @@
 project(hoedown C)
 
 set(
-	SOURCES
-	${hoedown_SOURCE_DIR}/src/autolink.c
-	${hoedown_SOURCE_DIR}/src/buffer.c
-	${hoedown_SOURCE_DIR}/src/document.c
-	${hoedown_SOURCE_DIR}/src/escape.c
-	${hoedown_SOURCE_DIR}/src/html_blocks.c
-	${hoedown_SOURCE_DIR}/src/html.c
-	${hoedown_SOURCE_DIR}/src/html_smartypants.c
-	${hoedown_SOURCE_DIR}/src/stack.c
-	${hoedown_SOURCE_DIR}/src/version.c
+    SOURCES
+    ${hoedown_SOURCE_DIR}/src/autolink.c
+    ${hoedown_SOURCE_DIR}/src/buffer.c
+    ${hoedown_SOURCE_DIR}/src/document.c
+    ${hoedown_SOURCE_DIR}/src/escape.c
+    ${hoedown_SOURCE_DIR}/src/html_blocks.c
+    ${hoedown_SOURCE_DIR}/src/html.c
+    ${hoedown_SOURCE_DIR}/src/html_smartypants.c
+    ${hoedown_SOURCE_DIR}/src/stack.c
+    ${hoedown_SOURCE_DIR}/src/version.c
 )
 
 set(
-	HEADERS
-	${hoedown_SOURCE_DIR}/include/hoedown/autolink.h
-	${hoedown_SOURCE_DIR}/include/hoedown/buffer.h
-	${hoedown_SOURCE_DIR}/include/hoedown/document.h
-	${hoedown_SOURCE_DIR}/include/hoedown/escape.h
-	${hoedown_SOURCE_DIR}/include/hoedown/html.h
-	${hoedown_SOURCE_DIR}/include/hoedown/stack.h
-	${hoedown_SOURCE_DIR}/include/hoedown/version.h
+    HEADERS
+    ${hoedown_SOURCE_DIR}/include/hoedown/autolink.h
+    ${hoedown_SOURCE_DIR}/include/hoedown/buffer.h
+    ${hoedown_SOURCE_DIR}/include/hoedown/document.h
+    ${hoedown_SOURCE_DIR}/include/hoedown/escape.h
+    ${hoedown_SOURCE_DIR}/include/hoedown/html.h
+    ${hoedown_SOURCE_DIR}/include/hoedown/stack.h
+    ${hoedown_SOURCE_DIR}/include/hoedown/version.h
 )
 
 add_library(hoedown STATIC ${SOURCES} ${HEADERS})
 target_include_directories(
-	hoedown
-		PUBLIC ${hoedown_SOURCE_DIR}/include
-		PRIVATE ${hoedown_SOURCE_DIR}/include/hoedown
+    hoedown
+        PUBLIC ${hoedown_SOURCE_DIR}/include
+        PRIVATE ${hoedown_SOURCE_DIR}/include/hoedown
 )
 
 if (MSVC)
-	target_compile_definitions(hoedown PRIVATE _CRT_SECURE_NO_WARNINGS)
+    target_compile_definitions(hoedown PRIVATE _CRT_SECURE_NO_WARNINGS)
 endif ()
\ No newline at end of file
--- a/jansson/CMakeLists.txt	Tue May 24 13:59:28 2016 +0200
+++ b/jansson/CMakeLists.txt	Wed Jun 22 09:38:51 2016 +0200
@@ -66,15 +66,15 @@
 check_type_size("int" INT)
 
 if (HAVE_INT32_T)
-	set(JSON_INT32 int32_t)
+    set(JSON_INT32 int32_t)
 elseif (HAVE___INT32)
-	set(JSON_INT32 __int32)
+    set(JSON_INT32 __int32)
 elseif (HAVE_LONG_INT AND (${LONG_INT} EQUAL 4))
-	set(JSON_INT32 long)
+    set(JSON_INT32 long)
 elseif (HAVE_INT AND (${INT} EQUAL 4))
-	set(JSON_INT32 int)
+    set(JSON_INT32 int)
 else ()
-	message (FATAL_ERROR "Could not detect a valid 32-bit integer type")
+    message (FATAL_ERROR "Could not detect a valid 32-bit integer type")
 endif ()
 
 check_type_size("unsigned long" UNSIGNED_LONG_INT)
@@ -84,52 +84,52 @@
 check_type_size(__uint32 __UINT32)
 
 if (HAVE_UINT32_T)
-	set(JSON_UINT32 uint32_t)
+    set(JSON_UINT32 uint32_t)
 elseif (HAVE___UINT32)
-	set(JSON_UINT32 __uint32)
+    set(JSON_UINT32 __uint32)
 elseif (HAVE_UNSIGNED_LONG_INT AND (${UNSIGNED_LONG_INT} EQUAL 4))
-	set(JSON_UINT32 "unsigned long")
+    set(JSON_UINT32 "unsigned long")
 elseif (HAVE_UNSIGNED_INT AND (${UNSIGNED_INT} EQUAL 4))
-	set(JSON_UINT32 "unsigned int")
+    set(JSON_UINT32 "unsigned int")
 else ()
-	message(FATAL_ERROR "Could not detect a valid unsigned 32-bit integer type")
+    message(FATAL_ERROR "Could not detect a valid unsigned 32-bit integer type")
 endif ()
 
 check_type_size(uint16_t UINT16_T)
 check_type_size(__uint16 __UINT16)
 
 if (HAVE_UINT16_T)
-	set(JSON_UINT16 uint16_t)
+    set(JSON_UINT16 uint16_t)
 elseif (HAVE___UINT16)
-	set(JSON_UINT16 __uint16)
+    set(JSON_UINT16 __uint16)
 elseif (HAVE_UNSIGNED_INT AND (${UNSIGNED_INT} EQUAL 2))
-	set(JSON_UINT16 "unsigned int")
+    set(JSON_UINT16 "unsigned int")
 elseif (HAVE_UNSIGNED_SHORT AND (${UNSIGNED_SHORT} EQUAL 2))
-	set(JSON_UINT16 "unsigned short")
+    set(JSON_UINT16 "unsigned short")
 else ()
-	message(FATAL_ERROR "Could not detect a valid unsigned 16-bit integer type")
+    message(FATAL_ERROR "Could not detect a valid unsigned 16-bit integer type")
 endif ()
 
 check_type_size(uint8_t UINT8_T)
 check_type_size(__uint8 __UINT8)
 
 if (HAVE_UINT8_T)
-	set(JSON_UINT8 uint8_t)
+    set(JSON_UINT8 uint8_t)
 elseif (HAVE___UINT8)
-	set(JSON_UINT8 __uint8)
+    set(JSON_UINT8 __uint8)
 else ()
-	set(JSON_UINT8 "unsigned char")
+    set(JSON_UINT8 "unsigned char")
 endif ()
 
 check_type_size(ssize_t SSIZE_T)
 check_type_size(SSIZE_T UPPERCASE_SSIZE_T)
 
 if(NOT HAVE_SSIZE_T)
-	if(HAVE_UPPERCASE_SSIZE_T)
-		set(JSON_SSIZE SSIZE_T)
-	else()
-		set(JSON_SSIZE int)
-	endif()
+    if(HAVE_UPPERCASE_SSIZE_T)
+        set(JSON_SSIZE SSIZE_T)
+    else()
+        set(JSON_SSIZE int)
+    endif()
 endif()
 
 set(CMAKE_EXTRA_INCLUDE_FILES "")
@@ -139,42 +139,42 @@
 check_function_exists(_strtoi64 HAVE__STRTOI64)
 
 if (HAVE_STRTOLL)
-	set(JSON_STRTOINT strtoll)
+    set(JSON_STRTOINT strtoll)
 elseif (HAVE_STRTOQ)
-	set(JSON_STRTOINT strtoq)
+    set(JSON_STRTOINT strtoq)
 elseif (HAVE__STRTOI64)
-	set(JSON_STRTOINT _strtoi64)
+    set(JSON_STRTOINT _strtoi64)
 else ()
-	set (JSON_STRTOINT strtol)
-	set (JSON_INT_T long)
-	set (JSON_INTEGER_FORMAT "\"ld\"")
+    set (JSON_STRTOINT strtol)
+    set (JSON_INT_T long)
+    set (JSON_INTEGER_FORMAT "\"ld\"")
 endif ()
 
 if (NOT DEFINED JSON_INT_T)
-	if (HAVE_LONG_LONG_INT AND (${LONG_LONG_INT} EQUAL 8))
-		set(JSON_INT_T "long long")
-	elseif (HAVE_INT64_T)
-		set(JSON_INT_T int64_t)
-	elseif (HAVE___INT64)
-		set(JSON_INT_T __int64)
-	else ()
-		message(FATAL_ERROR "Could not detect 64 bit type, although I detected the strtoll equivalent")
-	endif ()
+    if (HAVE_LONG_LONG_INT AND (${LONG_LONG_INT} EQUAL 8))
+        set(JSON_INT_T "long long")
+    elseif (HAVE_INT64_T)
+        set(JSON_INT_T int64_t)
+    elseif (HAVE___INT64)
+        set(JSON_INT_T __int64)
+    else ()
+        message(FATAL_ERROR "Could not detect 64 bit type, although I detected the strtoll equivalent")
+    endif ()
 
-	if (WIN32)
-		set(JSON_INTEGER_FORMAT "\"I64d\"")
-	else ()
-		set(JSON_INTEGER_FORMAT "\"lld\"")
-	endif ()
+    if (WIN32)
+        set(JSON_INTEGER_FORMAT "\"I64d\"")
+    else ()
+        set(JSON_INTEGER_FORMAT "\"lld\"")
+    endif ()
 endif ()
 
 check_include_files (locale.h HAVE_LOCALE_H)
 check_function_exists (localeconv HAVE_LOCALECONV)
 
 if (HAVE_LOCALECONV AND HAVE_LOCALE_H)
-	set(JSON_HAVE_LOCALECONV 1)
+    set(JSON_HAVE_LOCALECONV 1)
 else ()
-	set(JSON_HAVE_LOCALECONV 0)
+    set(JSON_HAVE_LOCALECONV 0)
 endif()
 
 check_function_exists(setlocale HAVE_SETLOCALE)
@@ -184,85 +184,85 @@
 check_function_keywords("__inline__")
 
 if (HAVE_INLINE)
-	set(JSON_INLINE inline)
+    set(JSON_INLINE inline)
 elseif (HAVE___INLINE)
-	set(JSON_INLINE __inline)
+    set(JSON_INLINE __inline)
 elseif (HAVE___INLINE__)
-	set(JSON_INLINE __inline__)
+    set(JSON_INLINE __inline__)
 else()
-	set (JSON_INLINE)
+    set (JSON_INLINE)
 endif()
 
 check_function_exists(snprintf HAVE_SNPRINTF)
 check_function_exists(_snprintf HAVE__SNPRINTF)
 
 if (HAVE_SNPRINTF)
-	set(JSON_SNPRINTF snprintf)
+    set(JSON_SNPRINTF snprintf)
 elseif (HAVE__SNPRINTF)
-	set(JSON_SNPRINTF _snprintf)
+    set(JSON_SNPRINTF _snprintf)
 endif () 
 
 check_c_source_compiles("int main() { unsigned long val; __sync_bool_compare_and_swap(&val, 0, 1); return 0; } " HAVE_SYNC_BUILTINS)
 check_c_source_compiles("int main() { char l; unsigned long v; __atomic_test_and_set(&l, __ATOMIC_RELAXED); __atomic_store_n(&v, 1, __ATOMIC_RELEASE); __atomic_load_n(&v, __ATOMIC_ACQUIRE); return 0; }" HAVE_ATOMIC_BUILTINS)
 
 configure_file(
-	${jansson_SOURCE_DIR}/cmake/jansson_config.h.cmake
-	${jansson_BINARY_DIR}/include/jansson_config.h
+    ${jansson_SOURCE_DIR}/cmake/jansson_config.h.cmake
+    ${jansson_BINARY_DIR}/include/jansson_config.h
 )
 
 file(
-	COPY ${jansson_SOURCE_DIR}/src/jansson.h
-	DESTINATION ${jansson_BINARY_DIR}/include/
+    COPY ${jansson_SOURCE_DIR}/src/jansson.h
+    DESTINATION ${jansson_BINARY_DIR}/include/
 )
 
 add_definitions(-DJANSSON_USING_CMAKE)
 
 configure_file(
-	${jansson_SOURCE_DIR}/cmake/jansson_private_config.h.cmake
-	${jansson_BINARY_DIR}/private_include/jansson_private_config.h
+    ${jansson_SOURCE_DIR}/cmake/jansson_private_config.h.cmake
+    ${jansson_BINARY_DIR}/private_include/jansson_private_config.h
 )
 
 add_definitions(-DHAVE_CONFIG_H)
 
 set(
-	JANSSON_SRC
-	${jansson_SOURCE_DIR}/src/dump.c
-	${jansson_SOURCE_DIR}/src/error.c
-	${jansson_SOURCE_DIR}/src/hashtable.c
-	${jansson_SOURCE_DIR}/src/hashtable_seed.c
-	${jansson_SOURCE_DIR}/src/load.c
-	${jansson_SOURCE_DIR}/src/memory.c
-	${jansson_SOURCE_DIR}/src/pack_unpack.c
-	${jansson_SOURCE_DIR}/src/strbuffer.c
-	${jansson_SOURCE_DIR}/src/strconv.c
-	${jansson_SOURCE_DIR}/src/utf.c
-	${jansson_SOURCE_DIR}/src/value.c
+    JANSSON_SRC
+    ${jansson_SOURCE_DIR}/src/dump.c
+    ${jansson_SOURCE_DIR}/src/error.c
+    ${jansson_SOURCE_DIR}/src/hashtable.c
+    ${jansson_SOURCE_DIR}/src/hashtable_seed.c
+    ${jansson_SOURCE_DIR}/src/load.c
+    ${jansson_SOURCE_DIR}/src/memory.c
+    ${jansson_SOURCE_DIR}/src/pack_unpack.c
+    ${jansson_SOURCE_DIR}/src/strbuffer.c
+    ${jansson_SOURCE_DIR}/src/strconv.c
+    ${jansson_SOURCE_DIR}/src/utf.c
+    ${jansson_SOURCE_DIR}/src/value.c
 )
 
 set(
-	JANSSON_HDR_PRIVATE
-	${jansson_SOURCE_DIR}/src/hashtable.h
-	${jansson_SOURCE_DIR}/src/jansson_private.h
-	${jansson_SOURCE_DIR}/src/strbuffer.h
-	${jansson_SOURCE_DIR}/src/utf.h
-	${jansson_BINARY_DIR}/private_include/jansson_private_config.h
+    JANSSON_HDR_PRIVATE
+    ${jansson_SOURCE_DIR}/src/hashtable.h
+    ${jansson_SOURCE_DIR}/src/jansson_private.h
+    ${jansson_SOURCE_DIR}/src/strbuffer.h
+    ${jansson_SOURCE_DIR}/src/utf.h
+    ${jansson_BINARY_DIR}/private_include/jansson_private_config.h
 )
 
 set(
-	JANSSON_HDR_PUBLIC 
-	${jansson_BINARY_DIR}/include/jansson_config.h
-	${jansson_SOURCE_DIR}/src/jansson.h
+    JANSSON_HDR_PUBLIC 
+    ${jansson_BINARY_DIR}/include/jansson_config.h
+    ${jansson_SOURCE_DIR}/src/jansson.h
 )
 
 add_library(jansson STATIC ${JANSSON_SRC} ${JANSSON_HDR_PRIVATE} ${JANSSON_HDR_PUBLIC})
 
 target_include_directories(
-	jansson
-	PUBLIC ${jansson_BINARY_DIR}/include
-	PRIVATE ${jansson_BINARY_DIR}/private_include
+    jansson
+    PUBLIC ${jansson_BINARY_DIR}/include
+    PRIVATE ${jansson_BINARY_DIR}/private_include
 )
 
 if (MSVC)
-	target_compile_definitions(jansson PUBLIC _CRT_SECURE_NO_WARNINGS)
-	target_compile_options(jansson PUBLIC /W3 /D /wd4005 /wd4996 /wd4334 /wd4267)
+    target_compile_definitions(jansson PUBLIC _CRT_SECURE_NO_WARNINGS)
+    target_compile_options(jansson PUBLIC /W3 /D /wd4005 /wd4996 /wd4334 /wd4267)
 endif()
--- a/jsoncpp/CMakeLists.txt	Tue May 24 13:59:28 2016 +0200
+++ b/jsoncpp/CMakeLists.txt	Wed Jun 22 09:38:51 2016 +0200
@@ -20,10 +20,10 @@
 project(jsoncpp)
 
 set(
-	SOURCES
-	${jsoncpp_SOURCE_DIR}/jsoncpp.cpp
-	${jsoncpp_SOURCE_DIR}/json/json.h
-	${jsoncpp_SOURCE_DIR}/json/json-forwards.h
+    SOURCES
+    ${jsoncpp_SOURCE_DIR}/jsoncpp.cpp
+    ${jsoncpp_SOURCE_DIR}/json/json.h
+    ${jsoncpp_SOURCE_DIR}/json/json-forwards.h
 )
 
 add_library(jsoncpp STATIC ${SOURCES})
--- a/pugixml/CMakeLists.txt	Tue May 24 13:59:28 2016 +0200
+++ b/pugixml/CMakeLists.txt	Wed Jun 22 09:38:51 2016 +0200
@@ -20,10 +20,10 @@
 project(pugixml CXX)
 
 set(
-	SOURCES
-	${pugixml_SOURCE_DIR}/src/pugiconfig.hpp
-	${pugixml_SOURCE_DIR}/src/pugixml.cpp
-	${pugixml_SOURCE_DIR}/src/pugixml.hpp
+    SOURCES
+    ${pugixml_SOURCE_DIR}/src/pugiconfig.hpp
+    ${pugixml_SOURCE_DIR}/src/pugixml.cpp
+    ${pugixml_SOURCE_DIR}/src/pugixml.hpp
 )
 
 add_library(pugixml STATIC ${SOURCES})
--- a/yaml/CMakeLists.txt	Tue May 24 13:59:28 2016 +0200
+++ b/yaml/CMakeLists.txt	Wed Jun 22 09:38:51 2016 +0200
@@ -25,16 +25,16 @@
 set(YAML_VERSION_STRING "${YAML_VERSION_MAJOR}.${YAML_VERSION_MINOR}.${YAML_VERSION_PATCH}")
 
 set(
-	SOURCES
-	src/api.c
-	src/dumper.c
-	src/emitter.c
-	src/loader.c
-	src/parser.c
-	src/reader.c
-	src/scanner.c
-	src/writer.c
-	src/yaml_private.h
+    SOURCES
+    src/api.c
+    src/dumper.c
+    src/emitter.c
+    src/loader.c
+    src/parser.c
+    src/reader.c
+    src/scanner.c
+    src/writer.c
+    src/yaml_private.h
 )
 
 add_library(yaml STATIC ${SOURCES})
@@ -42,16 +42,16 @@
 target_include_directories(yaml PUBLIC ${yaml_SOURCE_DIR}/include)
 
 target_compile_definitions(
-	yaml
-	PRIVATE
-	YAML_DECLARE_STATIC
-	YAML_VERSION_MAJOR=${YAML_VERSION_MAJOR}
-	YAML_VERSION_MINOR=${YAML_VERSION_MINOR}
-	YAML_VERSION_PATCH=${YAML_VERSION_PATCH}
-	YAML_VERSION_STRING=\"${YAML_VERSION_STRING}\"
+    yaml
+    PRIVATE
+    YAML_DECLARE_STATIC
+    YAML_VERSION_MAJOR=${YAML_VERSION_MAJOR}
+    YAML_VERSION_MINOR=${YAML_VERSION_MINOR}
+    YAML_VERSION_PATCH=${YAML_VERSION_PATCH}
+    YAML_VERSION_STRING=\"${YAML_VERSION_STRING}\"
 )
 
 if (MSVC)
-	target_compile_definitions(yaml PUBLIC _CRT_SECURE_NO_WARNINGS)
-	target_compile_options(yaml PUBLIC /wd4244 /wd4267 /wd4996)
+    target_compile_definitions(yaml PUBLIC _CRT_SECURE_NO_WARNINGS)
+    target_compile_options(yaml PUBLIC /wd4244 /wd4267 /wd4996)
 endif ()