bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

CMake: cleanup

Browse Source
This commit is contained in:
Campbell Barton 2017-10-30 12:58:44 +11:00
parent 8277bee748
commit 619600a53f
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -1608,10 +1608,10 @@ include(build_files/cmake/packaging.cmake)
# Use dynamic loading for OpenMP # Use dynamic loading for OpenMP
if(WITH_BLENDER) if(WITH_BLENDER)
openmp_delayload(blender) openmp_delayload(blender)
endif(WITH_BLENDER) endif()
if(WITH_PLAYER) if(WITH_PLAYER)
openmp_delayload(blenderplayer) openmp_delayload(blenderplayer)
endif(WITH_PLAYER) endif()
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Print Final Configuration # Print Final Configuration

6
build_files/buildbot/config/blender_linux.cmake
View File

@ -5,15 +5,15 @@ include("${CMAKE_CURRENT_LIST_DIR}/../../cmake/config/blender_full.cmake")
# Detect which libc we'll be linking against. # Detect which libc we'll be linking against.
# Some of the paths will depend on this # 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") message(STATUS "Building in GLibc-2.19 environment")
set(GLIBC "2.19") set(GLIBC "2.19")
set(MULTILIB "/x86_64-linux-gnu") 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") message(STATUS "Building in GLibc-2.19 environment")
set(GLIBC "2.19") set(GLIBC "2.19")
set(MULTILIB "/i386-linux-gnu") 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") message(STATUS "Building in GLibc-2.11 environment")
set(GLIBC "2.11") set(GLIBC "2.11")
set(MULTILIB "") set(MULTILIB "")

8
build_files/cmake/macros.cmake
View File

@ -282,7 +282,7 @@ function(SETUP_LIBDIRS)
# NOTE: For all new libraries, use absolute library paths. # NOTE: For all new libraries, use absolute library paths.
# This should eventually be phased out. # This should eventually be phased out.
if (NOT MSVC) if(NOT MSVC)
link_directories(${JPEG_LIBPATH} ${PNG_LIBPATH} ${ZLIB_LIBPATH} ${FREETYPE_LIBPATH}) link_directories(${JPEG_LIBPATH} ${PNG_LIBPATH} ${ZLIB_LIBPATH} ${FREETYPE_LIBPATH})
if(WITH_PYTHON) # AND NOT WITH_PYTHON_MODULE # WIN32 needs if(WITH_PYTHON) # AND NOT WITH_PYTHON_MODULE # WIN32 needs
@ -342,7 +342,7 @@ function(SETUP_LIBDIRS)
if(WIN32 AND NOT UNIX) if(WIN32 AND NOT UNIX)
link_directories(${PTHREADS_LIBPATH}) link_directories(${PTHREADS_LIBPATH})
endif() endif()
endif(NOT MSVC) endif()
endfunction() endfunction()
function(setup_liblinks 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_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_RELWITHDEBINFO "/DELAYLOAD:${OPENMP_DLL_NAME}.dll delayimp.lib")
SET_TARGET_PROPERTIES(${projectname} PROPERTIES LINK_FLAGS_MINSIZEREL "/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()
endif(MSVC) endif()
endmacro() endmacro()
MACRO(WINDOWS_SIGN_TARGET target) MACRO(WINDOWS_SIGN_TARGET target)

8
build_files/cmake/platform/platform_win32.cmake
View File

@ -35,14 +35,14 @@ macro(warn_hardcoded_paths package_name
) )
if(WITH_WINDOWS_FIND_MODULES) if(WITH_WINDOWS_FIND_MODULES)
message(WARNING "Using HARDCODED ${package_name} locations") message(WARNING "Using HARDCODED ${package_name} locations")
endif(WITH_WINDOWS_FIND_MODULES) endif()
endmacro() endmacro()
macro(windows_find_package package_name macro(windows_find_package package_name
) )
if(WITH_WINDOWS_FIND_MODULES) if(WITH_WINDOWS_FIND_MODULES)
find_package(${package_name}) find_package(${package_name})
endif(WITH_WINDOWS_FIND_MODULES) endif()
endmacro() endmacro()
macro(find_package_wrapper) macro(find_package_wrapper)
@ -338,9 +338,9 @@ if(WITH_BOOST)
set(Boost_USE_STATIC_RUNTIME ON) # prefix lib set(Boost_USE_STATIC_RUNTIME ON) # prefix lib
set(Boost_USE_MULTITHREADED ON) # suffix -mt set(Boost_USE_MULTITHREADED ON) # suffix -mt
set(Boost_USE_STATIC_LIBS ON) # suffix -s 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}) find_package(Boost COMPONENTS date_time filesystem thread regex system ${boost_extra_libs})
endif (WITH_WINDOWS_FIND_MODULES) endif()
if(NOT Boost_FOUND) if(NOT Boost_FOUND)
warn_hardcoded_paths(BOOST) warn_hardcoded_paths(BOOST)
set(BOOST ${LIBDIR}/boost) set(BOOST ${LIBDIR}/boost)

2
extern/CMakeLists.txt vendored
View File

@ -99,7 +99,7 @@ if(WITH_LIBMV)
endif() endif()
if(WITH_LIBMV OR WITH_GTESTS OR (WITH_CYCLES AND WITH_CYCLES_LOGGING)) 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) add_subdirectory(gflags)
endif() endif()
add_subdirectory(glog) add_subdirectory(glog)