Cleanup: trailing space
authorCampbell Barton <ideasman42@gmail.com>
Mon, 20 Aug 2018 01:24:14 +0000 (11:24 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 20 Aug 2018 01:24:14 +0000 (11:24 +1000)
12 files changed:
build_files/build_environment/cmake/alembic.cmake
build_files/build_environment/cmake/ilmbase.cmake
build_files/build_environment/cmake/lcms.cmake
build_files/build_environment/cmake/opencolorio.cmake
build_files/build_environment/cmake/openexr.cmake
build_files/build_environment/cmake/opensubdiv.cmake
build_files/build_environment/cmake/openvdb.cmake
build_files/build_environment/cmake/osl.cmake
build_files/build_environment/cmake/python.cmake
build_files/build_environment/cmake/tinyxml.cmake
build_files/build_environment/cmake/versions.cmake
build_files/build_environment/cmake/zlib.cmake

index 245b5781216dc32cde142c4cc02d6c3a3a2a8c47..4c0caecf335120ff9048419b3591b89ff2e1b1cf 100644 (file)
@@ -85,7 +85,7 @@ if(WIN32)
                        COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/alembic/lib/alembic.lib ${HARVEST_TARGET}/alembic/lib/alembic_d.lib
                        DEPENDEES install
                )
-       endif() 
+       endif()
 endif()
 
 
index 4863cc6865a8ffcac734c88a0b3aadb8b30ab00b..22be39c3ff1afb4439c34e465eb3fe65ea273c0d 100644 (file)
@@ -55,4 +55,4 @@ else()
                INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/ilmbase/src/external_ilmbase/ && make install
                INSTALL_DIR ${LIBDIR}/openexr
        )
-endif()
\ No newline at end of file
+endif()
index 943fab7e19c580d1f3c8c513ec757d379504be43..f67a85c3721080eb488408236a3d131df5d6e036 100644 (file)
@@ -24,7 +24,7 @@ ExternalProject_Add(external_lcms
        DOWNLOAD_DIR ${DOWNLOAD_DIR}
        URL_HASH MD5=${LCMS_HASH}
        PREFIX ${BUILD_DIR}/lcms
-       #patch taken from ocio 
+       #patch taken from ocio
        PATCH_COMMAND ${CMAKE_COMMAND} -E copy ${PATCH_DIR}/cmakelists_lcms.txt ${BUILD_DIR}/lcms/src/external_lcms/CMakeLists.txt
        CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/lcms ${DEFAULT_CMAKE_FLAGS} ${LCMS_EXTRA_ARGS}
        INSTALL_DIR ${LIBDIR}/lcms
index 889c25225a947c875d6f83b66408fae5f8229b21..db0350e8d9dca8b146ad850b8df5d6f14e1674ae 100644 (file)
@@ -50,7 +50,7 @@ if(WIN32)
                -DUSE_EXTERNAL_LCMS=ON
                -DINC_1=${LIBDIR}/tinyxml/include
                -DINC_2=${LIBDIR}/yamlcpp/include
-               #lie because ocio cmake is demanding boost even though it is not needed 
+               #lie because ocio cmake is demanding boost even though it is not needed
                -DYAML_CPP_VERSION=0.5.0
        )
 else()
@@ -89,7 +89,7 @@ if(WIN32)
                external_opencolorio
                external_tinyxml
                external_yamlcpp
-               
+
        )
        if(BUILD_MODE STREQUAL Release)
                ExternalProject_Add_Step(external_opencolorio after_install
@@ -108,6 +108,6 @@ if(WIN32)
                        DEPENDEES install
                )
        endif()
-       
+
 endif()
 
index 78ad6932c7a9bf6da9c9377adcabe17e483d2a54..59e9a46b4f8a6d4b9f86d2e3b3823b648565b228 100644 (file)
@@ -41,15 +41,15 @@ if(WIN32)
                CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openexr ${DEFAULT_CMAKE_FLAGS} ${OPENEXR_EXTRA_ARGS}
                INSTALL_DIR ${LIBDIR}/openexr
        )
-       
+
        ExternalProject_Add_Step(external_openexr after_install
                COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openexr/lib ${HARVEST_TARGET}/openexr/lib
-               #libs have moved between versions, just duplicate it for now. 
+               #libs have moved between versions, just duplicate it for now.
                COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openexr/lib ${LIBDIR}/ilmbase/lib
-               COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openexr/include ${HARVEST_TARGET}/openexr/include 
+               COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openexr/include ${HARVEST_TARGET}/openexr/include
                DEPENDEES install
        )
-       
+
 else()
        set(OPENEXR_PKG_CONFIG_PATH ${LIBDIR}/zlib/share/pkgconfig)
        set(OPENEXR_EXTRA_ARGS
index 18b51f5722561f6fffaa07c5f02937045c5e3b3a..217274431d52c240204450ac73eb858031d085fd 100644 (file)
@@ -54,7 +54,7 @@ if(WIN32)
                        -DNO_CUDA=ON
                )
        endif()
-       
+
 else()
        set(OPENSUBDIV_EXTRA_ARGS
                ${OPENSUBDIV_EXTRA_ARGS}
@@ -89,7 +89,7 @@ if(WIN32)
                        COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opensubdiv/lib/osdGPU.lib ${HARVEST_TARGET}/opensubdiv/lib/osdGPU_d.lib
                        DEPENDEES install
                )
-       endif() 
+       endif()
 endif()
 
 add_dependencies(
index 06b8f59f4510dc4c84f66f0aaab246f09e68185f..85c3d84771a5f7e287ce476197ad2fabd7a03a35 100644 (file)
@@ -55,7 +55,7 @@ set(OPENVDB_EXTRA_ARGS
 if(WIN32)
        #Namespaces seem to be buggy and cause linker erorrs due to things not
        #being in the correct namespace
-       #needs to link pthreads due to it being a blosc dependency 
+       #needs to link pthreads due to it being a blosc dependency
        set(OPENVDB_EXTRA_ARGS ${OPENVDB_EXTRA_ARGS}
                -DOPENEXR_NAMESPACE_VERSIONING=OFF
                -DEXTRA_LIBS:FILEPATH=${LIBDIR}/pthreads/lib/pthreadVC2.lib
index 3cab19510448ecddd2a4d071114f1d3ec41082ba..73e62f73cf2b4af86fbfad5405f3856c734c8e80 100644 (file)
@@ -83,7 +83,7 @@ ExternalProject_Add(external_osl
        LIST_SEPARATOR ^^
        URL_HASH MD5=${OSL_HASH}
        PREFIX ${BUILD_DIR}/osl
-       PATCH_COMMAND ${PATCH_CMD} -p 3 -d ${BUILD_DIR}/osl/src/external_osl < ${PATCH_DIR}/osl.diff 
+       PATCH_COMMAND ${PATCH_CMD} -p 3 -d ${BUILD_DIR}/osl/src/external_osl < ${PATCH_DIR}/osl.diff
        #       ${PATCH_CMD} -p 0 -d ${BUILD_DIR}/osl/src/external_osl < ${PATCH_DIR}/osl_simd_oiio.diff
        CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/osl -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} ${DEFAULT_CMAKE_FLAGS} ${OSL_EXTRA_ARGS}
        INSTALL_DIR ${LIBDIR}/osl
index f6bc5c3d29a04436fd4dfe0a9c849dee3cbe8c7b..3fbf3a4086819ad303b2bbf14f8e2dc6b2b5d4a7 100644 (file)
@@ -27,7 +27,7 @@ if(WIN32)
        else()
                set(SSL_POSTFIX)
        endif()
-       
+
        set(PYTHON_BINARY ${BUILD_DIR}/python/src/external_python/run/python${PYTHON_POSTFIX}.exe)
 
        macro(cmake_to_dos_path MsysPath ResultingPath)
@@ -52,9 +52,9 @@ if(WIN32)
                PREFIX ${BUILD_DIR}/python
                PATCH_COMMAND
                        echo mklink /D "${PYTHON_EXTERNALS_FOLDER_DOS}" "${DOWNLOADS_EXTERNALS_FOLDER_DOS}" &&
-                       mklink /D "${PYTHON_EXTERNALS_FOLDER_DOS}" "${DOWNLOADS_EXTERNALS_FOLDER_DOS}" 
+                       mklink /D "${PYTHON_EXTERNALS_FOLDER_DOS}" "${DOWNLOADS_EXTERNALS_FOLDER_DOS}"
                CONFIGURE_COMMAND ""
-               BUILD_COMMAND cd ${BUILD_DIR}/python/src/external_python/pcbuild/ && set IncludeTkinter=false && call build.bat -e -p ${PYTHON_ARCH} -c ${BUILD_MODE} 
+               BUILD_COMMAND cd ${BUILD_DIR}/python/src/external_python/pcbuild/ && set IncludeTkinter=false && call build.bat -e -p ${PYTHON_ARCH} -c ${BUILD_MODE}
                INSTALL_COMMAND COMMAND
                        ${CMAKE_COMMAND} -E copy ${PYTHON_OUTPUTDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.dll ${LIBDIR}/python/lib/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.dll &&
                        ${CMAKE_COMMAND} -E copy ${PYTHON_OUTPUTDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.pdb ${LIBDIR}/python/lib/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.pdb &&
@@ -139,13 +139,13 @@ if(MSVC)
                COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/unicodedata${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/unicodedata${PYTHON_POSTFIX}.pyd
                COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/winsound${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/winsound${PYTHON_POSTFIX}.pyd
                #xxlimited is an example extention module, we don't need to ship it and debug doesn't build it
-               #leaving it commented out, so I won't get confused again with the next update. 
+               #leaving it commented out, so I won't get confused again with the next update.
                #COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/xxlimited${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/xxlimited${PYTHON_POSTFIX}.pyd
                COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/libssl-1_1${SSL_POSTFIX}.dll" ${BUILD_DIR}/python/src/external_python/redist/lib/libssl-1_1${SSL_POSTFIX}.dll
                COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/libcrypto-1_1${SSL_POSTFIX}.dll" ${BUILD_DIR}/python/src/external_python/redist/lib/libcrypto-1_1${SSL_POSTFIX}.dll
                COMMAND ${CMAKE_COMMAND} -E chdir "${BUILD_DIR}/python/src/external_python/redist" ${CMAKE_COMMAND} -E tar "cfvz" "${LIBDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.tar.gz" "."
-               COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/python/ ${HARVEST_TARGET}/python/ 
-               COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.tar.gz ${HARVEST_TARGET}/Release/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.tar.gz 
+               COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/python/ ${HARVEST_TARGET}/python/
+               COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.tar.gz ${HARVEST_TARGET}/Release/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.tar.gz
        )
 
        add_custom_target(Package_Python ALL DEPENDS external_python ${LIBDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.tar.gz ${BUILD_DIR}/python/src/external_python/redist/bin/python${PYTHON_POSTFIX}.exe)
index 2896bf5938a23625318373d894eb9c9d76bd96ef..fb28e7cce2f908a0b15d37289316c6557bbda2e7 100644 (file)
@@ -24,7 +24,7 @@ ExternalProject_Add(external_tinyxml
        DOWNLOAD_DIR ${DOWNLOAD_DIR}
        URL_HASH MD5=${TINYXML_HASH}
        PREFIX ${BUILD_DIR}/tinyxml
-       #patch taken from ocio 
+       #patch taken from ocio
        PATCH_COMMAND ${PATCH_CMD} -p 1 -N -d ${BUILD_DIR}/tinyxml/src/external_tinyxml < ${PATCH_DIR}/tinyxml.diff
        CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/tinyxml ${DEFAULT_CMAKE_FLAGS} ${TINYXML_EXTRA_ARGS}
        INSTALL_DIR ${LIBDIR}/tinyxml
index aedaea456fd78910ff8f114ba1de28f6c0cec857..0d5d8e773e3573e8b9f3dceb71b9caa01dd1d699 100644 (file)
@@ -36,7 +36,7 @@ set(BOOST_VERSION 1.68.0)
 set(BOOST_VERSION_NODOTS 1_68_0)
 set(BOOST_URI https://dl.bintray.com/boostorg/release/${BOOST_VERSION}/source/boost_${BOOST_VERSION_NODOTS}.tar.gz)
 set(BOOST_HASH 5d8b4503582fffa9eefdb9045359c239)
-  
+
 set(BLOSC_VERSION 1.14.4)
 set(BLOSC_URI https://github.com/Blosc/c-blosc/archive/v${BLOSC_VERSION}.tar.gz)
 set(BLOSC_HASH e80dfc71e4cba03b8d01ed0876547ffe)
index 4c422d501eee68d9b559ff2a68f7c8c528cf4b9d..b768293487af6e5cffb61fec97da647482141800 100644 (file)
@@ -46,4 +46,4 @@ else()
                        DEPENDEES install
                )
        endif()
-endif()
\ No newline at end of file
+endif()