CMake: cleanup
authorCampbell Barton <ideasman42@gmail.com>
Mon, 30 Oct 2017 01:58:44 +0000 (12:58 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 30 Oct 2017 07:48:27 +0000 (18:48 +1100)
CMakeLists.txt
build_files/buildbot/config/blender_linux.cmake
build_files/cmake/macros.cmake
build_files/cmake/platform/platform_win32.cmake
extern/CMakeLists.txt

index 4a19c52be0dbe321033c11a1fc8ad32c1f5ff305..742383a9dedc90e807ff41edd8662253d71daea3 100644 (file)
@@ -1608,10 +1608,10 @@ include(build_files/cmake/packaging.cmake)
 # Use dynamic loading for OpenMP
 if(WITH_BLENDER)
        openmp_delayload(blender)
-endif(WITH_BLENDER)
+endif()
 if(WITH_PLAYER)
        openmp_delayload(blenderplayer)
-endif(WITH_PLAYER)
+endif()
 
 #-----------------------------------------------------------------------------
 # Print Final Configuration
index 53e841ba536f12068368c5aee566228441707e3f..22e88a82ffd33be38a27ded02466ac83bb4015cd 100644 (file)
@@ -5,15 +5,15 @@ include("${CMAKE_CURRENT_LIST_DIR}/../../cmake/config/blender_full.cmake")
 # Detect which libc we'll be linking against.
 # Some of the paths will depend on this
 
-if (EXISTS "/lib/x86_64-linux-gnu/libc-2.19.so")
+if(EXISTS "/lib/x86_64-linux-gnu/libc-2.19.so")
        message(STATUS "Building in GLibc-2.19 environment")
        set(GLIBC "2.19")
        set(MULTILIB "/x86_64-linux-gnu")
-elseif (EXISTS "/lib/i386-linux-gnu//libc-2.19.so")
+elseif(EXISTS "/lib/i386-linux-gnu//libc-2.19.so")
        message(STATUS "Building in GLibc-2.19 environment")
        set(GLIBC "2.19")
        set(MULTILIB "/i386-linux-gnu")
-elseif (EXISTS "/lib/libc-2.11.3.so")
+elseif(EXISTS "/lib/libc-2.11.3.so")
        message(STATUS "Building in GLibc-2.11 environment")
        set(GLIBC "2.11")
        set(MULTILIB "")
index afe5a2cdc72eac06430f84ad31afb097c2ce98fa..c79755bee9d061a64772baa165c5677d4489071c 100644 (file)
@@ -282,7 +282,7 @@ function(SETUP_LIBDIRS)
        # NOTE: For all new libraries, use absolute library paths.
        # This should eventually be phased out.
 
-       if (NOT MSVC)
+       if(NOT MSVC)
                link_directories(${JPEG_LIBPATH} ${PNG_LIBPATH} ${ZLIB_LIBPATH} ${FREETYPE_LIBPATH})
 
                if(WITH_PYTHON)  #  AND NOT WITH_PYTHON_MODULE  # WIN32 needs
@@ -342,7 +342,7 @@ function(SETUP_LIBDIRS)
                if(WIN32 AND NOT UNIX)
                        link_directories(${PTHREADS_LIBPATH})
                endif()
-       endif(NOT MSVC)
+       endif()
 endfunction()
 
 function(setup_liblinks
@@ -1562,8 +1562,8 @@ macro(openmp_delayload
                                SET_TARGET_PROPERTIES(${projectname} PROPERTIES LINK_FLAGS_DEBUG "/DELAYLOAD:${OPENMP_DLL_NAME}d.dll delayimp.lib")
                                SET_TARGET_PROPERTIES(${projectname} PROPERTIES LINK_FLAGS_RELWITHDEBINFO "/DELAYLOAD:${OPENMP_DLL_NAME}.dll delayimp.lib")
                                SET_TARGET_PROPERTIES(${projectname} PROPERTIES LINK_FLAGS_MINSIZEREL "/DELAYLOAD:${OPENMP_DLL_NAME}.dll delayimp.lib")
-                       endif(WITH_OPENMP)
-               endif(MSVC)
+                       endif()
+               endif()
 endmacro()
 
 MACRO(WINDOWS_SIGN_TARGET target)
index 840534a254aa77b8e37388409fa017af65b8825f..5cc5fb8c7d60a3b2d4b585e3d9c255a1c81ad75c 100644 (file)
@@ -35,14 +35,14 @@ macro(warn_hardcoded_paths package_name
        )
        if(WITH_WINDOWS_FIND_MODULES)
                message(WARNING "Using HARDCODED ${package_name} locations")
-       endif(WITH_WINDOWS_FIND_MODULES)
+       endif()
 endmacro()
 
 macro(windows_find_package package_name
        )
        if(WITH_WINDOWS_FIND_MODULES)
                find_package(${package_name})
-       endif(WITH_WINDOWS_FIND_MODULES)
+       endif()
 endmacro()
 
 macro(find_package_wrapper)
@@ -338,9 +338,9 @@ if(WITH_BOOST)
        set(Boost_USE_STATIC_RUNTIME ON) # prefix lib
        set(Boost_USE_MULTITHREADED ON) # suffix -mt
        set(Boost_USE_STATIC_LIBS ON) # suffix -s
-       if (WITH_WINDOWS_FIND_MODULES)
+       if(WITH_WINDOWS_FIND_MODULES)
                find_package(Boost COMPONENTS date_time filesystem thread regex system ${boost_extra_libs})
-       endif (WITH_WINDOWS_FIND_MODULES)
+       endif()
        if(NOT Boost_FOUND)
                warn_hardcoded_paths(BOOST)
                set(BOOST ${LIBDIR}/boost)
index 0e4853ee458b82026f34fb63ee7247d5898711cb..65958eee6f72448a50f5edf0dad63446804f5aa8 100644 (file)
@@ -99,7 +99,7 @@ if(WITH_LIBMV)
 endif()
 
 if(WITH_LIBMV OR WITH_GTESTS OR (WITH_CYCLES AND WITH_CYCLES_LOGGING))
-       if (NOT WITH_SYSTEM_GFLAGS)
+       if(NOT WITH_SYSTEM_GFLAGS)
                add_subdirectory(gflags)
        endif()
        add_subdirectory(glog)