kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Cleanup: cmake

Browse Source
This commit is contained in:
Campbell Barton 2014-11-13 15:03:30 +01:00
parent 284726baec
commit 9ebe44bc9c
3 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
CMakeLists.txt
View File

@ -378,7 +378,7 @@ endif()
# By default we want to install to the directory we are compiling our executables # By default we want to install to the directory we are compiling our executables
# unless specified otherwise, which we currently do not allow # unless specified otherwise, which we currently do not allow
IF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
if(MSVC) if(MSVC)
set(CMAKE_INSTALL_PREFIX ${EXECUTABLE_OUTPUT_PATH}/\${BUILD_TYPE} CACHE PATH "default install path" FORCE) set(CMAKE_INSTALL_PREFIX ${EXECUTABLE_OUTPUT_PATH}/\${BUILD_TYPE} CACHE PATH "default install path" FORCE)
elseif(APPLE) elseif(APPLE)
@ -1154,12 +1154,12 @@ elseif(WIN32)
endif() endif()
# Add each of our libraries to our cmake_prefix_path so find_package() could work # Add each of our libraries to our cmake_prefix_path so find_package() could work
FILE(GLOB children RELATIVE ${LIBDIR} ${LIBDIR}/*) file(GLOB children RELATIVE ${LIBDIR} ${LIBDIR}/*)
FOREACH(child ${children}) foreach(child ${children})
IF(IS_DIRECTORY ${LIBDIR}/${child}) if(IS_DIRECTORY ${LIBDIR}/${child})
LIST(APPEND CMAKE_PREFIX_PATH ${LIBDIR}/${child}) list(APPEND CMAKE_PREFIX_PATH ${LIBDIR}/${child})
ENDIF() endif()
ENDFOREACH() endforeach()
set(ZLIB_INCLUDE_DIRS ${LIBDIR}/zlib/include) set(ZLIB_INCLUDE_DIRS ${LIBDIR}/zlib/include)
set(ZLIB_LIBRARIES ${LIBDIR}/zlib/lib/libz_st.lib) set(ZLIB_LIBRARIES ${LIBDIR}/zlib/lib/libz_st.lib)
@ -1329,7 +1329,7 @@ elseif(WIN32)
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
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})
IF(NOT Boost_FOUND) if(NOT Boost_FOUND)
message(WARNING "USING HARDCODED boost locations") message(WARNING "USING HARDCODED boost locations")
set(BOOST ${LIBDIR}/boost) set(BOOST ${LIBDIR}/boost)
set(BOOST_INCLUDE_DIR ${BOOST}/include) set(BOOST_INCLUDE_DIR ${BOOST}/include)

4
intern/locale/CMakeLists.txt
View File

@ -38,7 +38,9 @@ set(SRC
if(APPLE) if(APPLE)
# Cocoa code to read the locale on OSX # Cocoa code to read the locale on OSX
list(APPEND SRC osx_user_locale.mm) list(APPEND SRC
osx_user_locale.mm
)
endif() endif()
if(WITH_HEADLESS) if(WITH_HEADLESS)