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/cmake/macros.cmake
View File

@ -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)

6
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)
@ -340,7 +340,7 @@ if(WITH_BOOST)
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)