From 1bb789956d42dc3e4a222a28b95a956ff8c97742 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 14 Jul 2010 20:26:46 +0000 Subject: =?UTF-8?q?CMake=20patch=20from=20Ralf=20H=C3=B6lzemer=20(cheleb)?= =?UTF-8?q?=20[#22849]=20Fix=20cmake=20install=20target=20on=20linux=20---?= =?UTF-8?q?=20from=20the=20tracker=20---=20This=20patch=20fixes=20the=20in?= =?UTF-8?q?stall=20target=20for=20the=20linux=20platform.=20Since=20the=20?= =?UTF-8?q?new=20configuration=20path=20changes=20are=20in=20effect,=20fil?= =?UTF-8?q?es=20have=20to=20be=20installed=20in=20the=20correct=20places?= =?UTF-8?q?=20instead=20of=20just=20copying=20the=20local=20installation?= =?UTF-8?q?=20to=20$PREFIX/share/blender.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It also provides a new macro to determine the correct blender version values. Changes in this patch include: - the .desktop menu file is installed in $PREFIX/share/applications and points to the svg icon instead of a png one, which is also installed in $PREFIX/share/pixmaps - docs are installed in $PREFIX/share/doc/blender - scripts are installed in in $PREFIX/share/blender/x.xx/ - locales are installed in in $PREFIX/share/blender/x.xx/datafiles - a new cmake macro determines and sets the correct values for BLENDER_VERSION_MAJOR, BLENDER_VERSION_MINOR, BLENDER_SUBVERSION, BLENDER_VERSION, BLENDER_MINVERSION_MAJOR, BLENDER_MINVERSION_MINOR, BLENDER_MINSUBVERSION and BLENDER_MINVERSION by parsing source/blender/blenkernel/BKE_blender.h and calculating major/minor values. This replaces the hardcoded value in the top CMakeLists file and is used by all platforms. --- CMakeLists.txt | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 70ec8952ce1..bec1353a8cf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -55,10 +55,6 @@ PROJECT(Blender) SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin) SET(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib) -# Note! - Could create this from the blender version string -# ...but thats quite involved, make sure this matches the blender version. -SET(BLENDER_VERSION 2.5) - #----------------------------------------------------------------------------- # Load some macros. INCLUDE(build_files/cmake/macros.cmake) @@ -66,6 +62,8 @@ INCLUDE(build_files/cmake/macros.cmake) #----------------------------------------------------------------------------- # Set default config options +GET_BLENDER_VERSION() + # Blender internal features OPTION(WITH_INTERNATIONAL "Enable I18N (International fonts and text)" ON) OPTION(WITH_LCMS "Enable color correction with lcms" OFF) -- cgit v1.2.3