From b5c439db4748b334a81b12cd134261915e47b3ab Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Wed, 30 Jan 2013 21:58:47 +0000 Subject: Fix cycles windows link errors when building with OSL master branch. --- CMakeLists.txt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 59dbeaed36b..e400380390f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1136,11 +1136,16 @@ elseif(WIN32) debug libboost_date_time-${BOOST_DEBUG_POSTFIX} debug libboost_filesystem-${BOOST_DEBUG_POSTFIX} debug libboost_regex-${BOOST_DEBUG_POSTFIX} debug libboost_system-${BOOST_DEBUG_POSTFIX} debug libboost_thread-${BOOST_DEBUG_POSTFIX}) + if(WITH_CYCLES_OSL) + set(BOOST_LIBRARIES ${BOOST_LIBRARIES} + optimized libboost_wave-${BOOST_POSTFIX} + debug libboost_wave-${BOOST_DEBUG_POSTFIX}) + endif() if(WITH_INTERNATIONAL) set(BOOST_LIBRARIES ${BOOST_LIBRARIES} optimized libboost_locale-${BOOST_POSTFIX} debug libboost_locale-${BOOST_DEBUG_POSTFIX}) - endif(WITH_INTERNATIONAL) + endif() set(BOOST_DEFINITIONS "-DBOOST_ALL_NO_LIB") endif() -- cgit v1.2.3 From dbf54dacf7e3fabe6ccb0e36a1743c91ac445b28 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 31 Jan 2013 11:05:09 +0000 Subject: Add Xinerama support for GHOST_GetMainDisplayDimensions() so X11 works as it should (previously would include all monitors). Now the active monitor size is used on startup. Currently the cursor position is checked for intersection with the monitor bounds to find the active screen. --- CMakeLists.txt | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index e400380390f..fbacb37b24e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -166,6 +166,7 @@ unset(PLATFORM_DEFAULT) if(UNIX AND NOT APPLE) option(WITH_X11_XINPUT "Enable X11 Xinput (tablet support and unicode input)" ON) + option(WITH_X11_XINERAMA "Enable multi-monitor support" ON) option(WITH_X11_XF86VMODE "Enable X11 video mode switching" ON) option(WITH_SYSTEM_GLEW "Use GLEW OpenGL wrapper library provided by the operating system" ON) @@ -414,6 +415,7 @@ if(WITH_GHOST_SDL OR WITH_HEADLESS) set(WITH_GHOST_XDND OFF) set(WITH_X11_XF86VMODE OFF) set(WITH_X11_XINPUT OFF) + set(WITH_X11_XINERAMA OFF) endif() if(MINGW) @@ -800,6 +802,10 @@ if(UNIX AND NOT APPLE) set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS} ${X11_Xinput_LIB}") endif() + if(WITH_X11_XINERAMA) + set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS} ${X11_Xinerama_LIB}") + endif() + if(WITH_X11_XF86VMODE) # XXX, why dont cmake make this available? FIND_LIBRARY(X11_Xxf86vmode_LIB Xxf86vm ${X11_LIB_SEARCH_PATH}) -- cgit v1.2.3 From 64c6736ef2888eaf2f694536eaf4b10b99c2de54 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 31 Jan 2013 20:41:47 +0000 Subject: disable xinerama and xinput if libraries are missing. --- CMakeLists.txt | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index fbacb37b24e..f5bca0a071f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -799,11 +799,19 @@ if(UNIX AND NOT APPLE) set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS} ${X11_X11_LIB}") if(WITH_X11_XINPUT) - set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS} ${X11_Xinput_LIB}") + if(X11_Xinput_LIB) + set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS} ${X11_Xinput_LIB}") + else() + set(WITH_X11_XINPUT OFF) + endif() endif() if(WITH_X11_XINERAMA) - set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS} ${X11_Xinerama_LIB}") + if(X11_Xinerama_LIB) + set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS} ${X11_Xinerama_LIB}") + else() + set(WITH_X11_XINERAMA OFF) + endif() endif() if(WITH_X11_XF86VMODE) @@ -2138,6 +2146,7 @@ if(FIRST_RUN) info_cfg_option(WITH_INSTALL_PORTABLE) info_cfg_option(WITH_X11_XF86VMODE) info_cfg_option(WITH_X11_XINPUT) + info_cfg_option(WITH_X11_XINERAMA) info_cfg_option(WITH_MEM_JEMALLOC) info_cfg_option(WITH_SYSTEM_GLEW) info_cfg_option(WITH_SYSTEM_OPENJPEG) -- cgit v1.2.3 From a2543d417313814993f62574d0d0c19c9d411975 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 31 Jan 2013 23:25:06 +0000 Subject: expose WITH_BOOST as a cmake option, this just disables boost deps since it was becoming annoying to remember all of them. --- CMakeLists.txt | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index f5bca0a071f..ace3803e0d8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -269,6 +269,9 @@ mark_as_advanced(WITH_CXX_GUARDEDALLOC) option(WITH_ASSERT_ABORT "Call abort() when raising an assertion through BLI_assert()" OFF) mark_as_advanced(WITH_ASSERT_ABORT) +option(WITH_BOOST "Enable features depending no boost" ON) + + if(APPLE) cmake_minimum_required(VERSION 2.8.8) cmake_policy(VERSION 2.8.8) @@ -396,9 +399,22 @@ if(WITH_CYCLES) set(WITH_OPENIMAGEIO ON) endif() -# auto enable boost for cycles, booleans, audaspace or i18n -if(WITH_CYCLES OR WITH_MOD_BOOLEAN OR WITH_AUDASPACE OR WITH_INTERNATIONAL) - set(WITH_BOOST ON) +# enable boost for cycles, booleans, audaspace or i18n +# otherwise if the user disabled +if(NOT WITH_BOOST) + # Explicitly disabled. so disable all deps. + set(WITH_CYCLES OFF) + set(WITH_MOD_BOOLEAN OFF) + set(WITH_AUDASPACE OFF) + set(WITH_INTERNATIONAL OFF) + + set(WITH_OPENAL OFF) # depends on AUDASPACE + set(WITH_GAMEENGINE OFF) # depends on AUDASPACE +elseif(WITH_CYCLES OR WITH_MOD_BOOLEAN OR WITH_AUDASPACE OR WITH_INTERNATIONAL) + # Keep enabled +else() + # Enabled but we don't need it + set(WITH_BOOST OFF) endif() # auto enable llvm for cycles_osl @@ -2184,12 +2200,10 @@ if(FIRST_RUN) info_cfg_option(WITH_MOD_FLUID) info_cfg_option(WITH_MOD_OCEANSIM) + # debug + message(STATUS "HAVE_STDBOOL_H = ${HAVE_STDBOOL_H}") + info_cfg_text("") message("${_config_msg}") endif() - -# debug -message( - STATUS "HAVE_STDBOOL_H = ${HAVE_STDBOOL_H}" -) -- cgit v1.2.3 From 7ef9e25384aaeff39810faa7d50d797bc47b6814 Mon Sep 17 00:00:00 2001 From: Jens Verwiebe Date: Tue, 5 Feb 2013 18:24:26 +0000 Subject: OSX/cmake: Fix ypthn version for module compile --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index ace3803e0d8..e948d0e76a8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1481,11 +1481,11 @@ elseif(APPLE) # module must be compiled against Python framework # normally cached but not since we include them with blender - set(PYTHON_VERSION 3.2) + set(PYTHON_VERSION 3.3) set(PYTHON_INCLUDE_DIR "/Library/Frameworks/Python.framework/Versions/${PYTHON_VERSION}/include/python${PYTHON_VERSION}m") set(PYTHON_BINARY "/Library/Frameworks/Python.framework/Versions/${PYTHON_VERSION}/bin/python${PYTHON_VERSION}") #set(PYTHON_LIBRARY python${PYTHON_VERSION}) - set(PYTHON_LIBPATH "/Library/Frameworks/Python.framework/Versions/${PYTHON_VERSION}/lib/python${PYTHON_VERSION}/config-3.2m") + set(PYTHON_LIBPATH "/Library/Frameworks/Python.framework/Versions/${PYTHON_VERSION}/lib/python${PYTHON_VERSION}/config-3.3m") #set(PYTHON_LINKFLAGS "-u _PyMac_Error -framework Python") # won't build with this enabled endif() -- cgit v1.2.3 From 98ecb723793eb2fabbda54cb1e2a6653b9ab360c Mon Sep 17 00:00:00 2001 From: Jens Verwiebe Date: Tue, 5 Feb 2013 19:49:53 +0000 Subject: OSX/cmake/scons: python version foolproof --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index e948d0e76a8..eea86a38521 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1485,7 +1485,7 @@ elseif(APPLE) set(PYTHON_INCLUDE_DIR "/Library/Frameworks/Python.framework/Versions/${PYTHON_VERSION}/include/python${PYTHON_VERSION}m") set(PYTHON_BINARY "/Library/Frameworks/Python.framework/Versions/${PYTHON_VERSION}/bin/python${PYTHON_VERSION}") #set(PYTHON_LIBRARY python${PYTHON_VERSION}) - set(PYTHON_LIBPATH "/Library/Frameworks/Python.framework/Versions/${PYTHON_VERSION}/lib/python${PYTHON_VERSION}/config-3.3m") + set(PYTHON_LIBPATH "/Library/Frameworks/Python.framework/Versions/${PYTHON_VERSION}/lib/python${PYTHON_VERSION}/config-${PYTHON_VERSION}m") #set(PYTHON_LINKFLAGS "-u _PyMac_Error -framework Python") # won't build with this enabled endif() -- cgit v1.2.3 From 76b7afd909fc0b01214c37f4b3407309f60ccfba Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 7 Feb 2013 14:10:01 +0000 Subject: removing xinerama on X11 dependency, this wasn't working very usefully. --- CMakeLists.txt | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index eea86a38521..d208d730e1d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -166,7 +166,6 @@ unset(PLATFORM_DEFAULT) if(UNIX AND NOT APPLE) option(WITH_X11_XINPUT "Enable X11 Xinput (tablet support and unicode input)" ON) - option(WITH_X11_XINERAMA "Enable multi-monitor support" ON) option(WITH_X11_XF86VMODE "Enable X11 video mode switching" ON) option(WITH_SYSTEM_GLEW "Use GLEW OpenGL wrapper library provided by the operating system" ON) @@ -431,7 +430,6 @@ if(WITH_GHOST_SDL OR WITH_HEADLESS) set(WITH_GHOST_XDND OFF) set(WITH_X11_XF86VMODE OFF) set(WITH_X11_XINPUT OFF) - set(WITH_X11_XINERAMA OFF) endif() if(MINGW) @@ -822,14 +820,6 @@ if(UNIX AND NOT APPLE) endif() endif() - if(WITH_X11_XINERAMA) - if(X11_Xinerama_LIB) - set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS} ${X11_Xinerama_LIB}") - else() - set(WITH_X11_XINERAMA OFF) - endif() - endif() - if(WITH_X11_XF86VMODE) # XXX, why dont cmake make this available? FIND_LIBRARY(X11_Xxf86vmode_LIB Xxf86vm ${X11_LIB_SEARCH_PATH}) @@ -2162,7 +2152,6 @@ if(FIRST_RUN) info_cfg_option(WITH_INSTALL_PORTABLE) info_cfg_option(WITH_X11_XF86VMODE) info_cfg_option(WITH_X11_XINPUT) - info_cfg_option(WITH_X11_XINERAMA) info_cfg_option(WITH_MEM_JEMALLOC) info_cfg_option(WITH_SYSTEM_GLEW) info_cfg_option(WITH_SYSTEM_OPENJPEG) -- cgit v1.2.3