diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-10-30 04:58:44 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-10-30 10:48:27 +0300 |
| commit | 619600a53f6d28f640d56117ef928a8cdb8b08ba (patch) | |
| tree | 49b1b832f4a95901396b54019f92e85fa2248802 /build_files | |
| parent | 8277bee748188dbcab431e15bedd5c1b5559508a (diff) | |
CMake: cleanup
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/buildbot/config/blender_linux.cmake | 6 | ||||
| -rw-r--r-- | build_files/cmake/macros.cmake | 8 | ||||
| -rw-r--r-- | build_files/cmake/platform/platform_win32.cmake | 8 |
3 files changed, 11 insertions, 11 deletions
diff --git a/build_files/buildbot/config/blender_linux.cmake b/build_files/buildbot/config/blender_linux.cmake index 53e841ba536..22e88a82ffd 100644 --- a/build_files/buildbot/config/blender_linux.cmake +++ b/build_files/buildbot/config/blender_linux.cmake @@ -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 "") diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake index afe5a2cdc72..c79755bee9d 100644 --- a/build_files/cmake/macros.cmake +++ b/build_files/cmake/macros.cmake @@ -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) diff --git a/build_files/cmake/platform/platform_win32.cmake b/build_files/cmake/platform/platform_win32.cmake index 840534a254a..5cc5fb8c7d6 100644 --- a/build_files/cmake/platform/platform_win32.cmake +++ b/build_files/cmake/platform/platform_win32.cmake @@ -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) |