From e7a68ef84360251bafe2f859aeba6517f9e1f81e Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 17 Jun 2018 20:15:24 +0200 Subject: Cleanup: trailing space in CMake files --- CMakeLists.txt | 4 ++-- extern/recastnavigation/CMakeLists.txt | 4 ++-- intern/audaspace/CMakeLists.txt | 2 +- intern/cycles/blender/CMakeLists.txt | 2 +- intern/cycles/kernel/shaders/CMakeLists.txt | 2 +- intern/dualcon/CMakeLists.txt | 2 +- intern/mikktspace/CMakeLists.txt | 2 +- intern/rigidbody/CMakeLists.txt | 2 +- release/windows/blendthumb/CMakeLists.txt | 17 +++++++++-------- 9 files changed, 19 insertions(+), 18 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3cfeaaa1be1..603eb38f92e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -873,11 +873,11 @@ if (NOT CMAKE_BUILD_TYPE MATCHES "Release") set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${COMPILER_ASAN_CXXFLAGS}") set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} ${COMPILER_ASAN_CXXFLAGS}") if(MSVC) - set(COMPILER_ASAN_LINKER_FLAGS "/FUNCTIONPADMIN:6") + set(COMPILER_ASAN_LINKER_FLAGS "/FUNCTIONPADMIN:6") endif() set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS};${COMPILER_ASAN_LIBRARY}") set(PLATFORM_LINKFLAGS "${COMPILER_ASAN_LIBRARY} ${COMPILER_ASAN_LINKER_FLAGS}") - set(PLATFORM_LINKFLAGS_DEBUG "${COMPILER_ASAN_LIBRARY} ${COMPILER_ASAN_LINKER_FLAGS}") + set(PLATFORM_LINKFLAGS_DEBUG "${COMPILER_ASAN_LIBRARY} ${COMPILER_ASAN_LINKER_FLAGS}") endif() endif() diff --git a/extern/recastnavigation/CMakeLists.txt b/extern/recastnavigation/CMakeLists.txt index 19ac6e9dde8..15092631737 100644 --- a/extern/recastnavigation/CMakeLists.txt +++ b/extern/recastnavigation/CMakeLists.txt @@ -25,7 +25,7 @@ remove_cc_flag_unsigned_char() -set(INC +set(INC Recast/Include Detour/Include ) @@ -34,7 +34,7 @@ set(INC_SYS ) -set(SRC +set(SRC recast-capi.cpp recast-capi.h diff --git a/intern/audaspace/CMakeLists.txt b/intern/audaspace/CMakeLists.txt index dd446613fd0..e3c1e81dc06 100644 --- a/intern/audaspace/CMakeLists.txt +++ b/intern/audaspace/CMakeLists.txt @@ -294,7 +294,7 @@ if(WITH_JACK) jack/AUD_JackDevice.h jack/AUD_JackLibrary.h - ) + ) if(WITH_JACK_DYNLOAD) add_definitions(-DWITH_JACK_DYNLOAD) diff --git a/intern/cycles/blender/CMakeLists.txt b/intern/cycles/blender/CMakeLists.txt index ae4977aaed0..77c72777aa6 100644 --- a/intern/cycles/blender/CMakeLists.txt +++ b/intern/cycles/blender/CMakeLists.txt @@ -39,7 +39,7 @@ set(SRC set(ADDON_FILES addon/__init__.py - addon/engine.py + addon/engine.py addon/osl.py addon/presets.py addon/properties.py diff --git a/intern/cycles/kernel/shaders/CMakeLists.txt b/intern/cycles/kernel/shaders/CMakeLists.txt index b28d017c1c2..40720bc3682 100644 --- a/intern/cycles/kernel/shaders/CMakeLists.txt +++ b/intern/cycles/kernel/shaders/CMakeLists.txt @@ -110,7 +110,7 @@ foreach(_file ${SRC_OSL}) string(REPLACE ".osl" ".oso" _OSO_FILE ${_OSL_FILE}) string(REPLACE ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} _OSO_FILE ${_OSO_FILE}) add_custom_command( - OUTPUT ${_OSO_FILE} + OUTPUT ${_OSO_FILE} COMMAND ${OSL_COMPILER} -q -O2 -I"${CMAKE_CURRENT_SOURCE_DIR}" -o ${_OSO_FILE} ${_OSL_FILE} DEPENDS ${_OSL_FILE} ${SRC_OSL_HEADERS} ${OSL_COMPILER}) list(APPEND SRC_OSO diff --git a/intern/dualcon/CMakeLists.txt b/intern/dualcon/CMakeLists.txt index 40c8ef8ff9c..213379e852e 100644 --- a/intern/dualcon/CMakeLists.txt +++ b/intern/dualcon/CMakeLists.txt @@ -30,7 +30,7 @@ set(SRC intern/marching_cubes_table.cpp intern/octree.cpp intern/Projections.cpp - + intern/cubes.h intern/GeoCommon.h intern/manifold_table.h diff --git a/intern/mikktspace/CMakeLists.txt b/intern/mikktspace/CMakeLists.txt index 8abd9559358..299ec7fe501 100644 --- a/intern/mikktspace/CMakeLists.txt +++ b/intern/mikktspace/CMakeLists.txt @@ -35,7 +35,7 @@ set(INC ) set(INC_SYS - + ) set(SRC diff --git a/intern/rigidbody/CMakeLists.txt b/intern/rigidbody/CMakeLists.txt index 5d84c2cf082..91fe1023b5e 100644 --- a/intern/rigidbody/CMakeLists.txt +++ b/intern/rigidbody/CMakeLists.txt @@ -31,7 +31,7 @@ set(INC_SYS set(SRC rb_bullet_api.cpp - + RBI_api.h ) diff --git a/release/windows/blendthumb/CMakeLists.txt b/release/windows/blendthumb/CMakeLists.txt index 1e5f5131a36..f0da43c2614 100644 --- a/release/windows/blendthumb/CMakeLists.txt +++ b/release/windows/blendthumb/CMakeLists.txt @@ -26,17 +26,18 @@ #----------------------------------------------------------------------------- cmake_minimum_required(VERSION 2.8) project(BlendThumb) - + #Bring the headers, such as Student.h into the project include_directories(${ZLIB_INCLUDE}) - + #Can manually add the sources using the set command as follows: -set(SOURCES src/BlenderThumb.cpp - src/BlendThumb.def - src/BlendThumb.rc - src/Dll.cpp +set(SRC + src/BlenderThumb.cpp + src/BlendThumb.def + src/BlendThumb.rc + src/Dll.cpp ) - -add_library(BlendThumb SHARED ${SOURCES}) + +add_library(BlendThumb SHARED ${SRC}) target_link_libraries(BlendThumb ${ZLIB_LIBS}) install (TARGETS BlendThumb DESTINATION bin) -- cgit v1.2.3