rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-21 11:54:15 +01:00
Code Issues Releases Activity

OP-1818 added CMake to toolchain - use 'make cmake_install' (windows only)

Browse Source
This commit is contained in:
Philippe Renon 2015-04-05 18:36:56 +02:00
parent f320de0970
commit 7612b15213
1 changed files with 40 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
make/tools.mk
View File

@ -94,30 +94,30 @@ else ifeq ($(UNAME), Windows)
UNCRUSTIFY_URL := http://wiki.openpilot.org/download/attachments/18612236/uncrustify-0.60-windows.tar.bz2 UNCRUSTIFY_URL := http://wiki.openpilot.org/download/attachments/18612236/uncrustify-0.60-windows.tar.bz2
DOXYGEN_URL := http://wiki.openpilot.org/download/attachments/18612236/doxygen-1.8.3.1-windows.tar.bz2 DOXYGEN_URL := http://wiki.openpilot.org/download/attachments/18612236/doxygen-1.8.3.1-windows.tar.bz2
MESAWIN_URL := http://wiki.openpilot.org/download/attachments/18612236/mesawin.tar.gz MESAWIN_URL := http://wiki.openpilot.org/download/attachments/18612236/mesawin.tar.gz
CMAKE_URL := http://www.cmake.org/files/v2.8/cmake-2.8.12.2-win32-x86.zip
CMAKE_MD5_URL := http://wiki.openpilot.org/download/attachments/18612236/cmake-2.8.12.2-win32-x86.zip.md5
endif endif
GTEST_URL := http://wiki.openpilot.org/download/attachments/18612236/gtest-1.6.0.zip GTEST_URL := http://wiki.openpilot.org/download/attachments/18612236/gtest-1.6.0.zip
# When changing PYTHON_DIR, you must also update it in ground/openpilotgcs/src/python.pri
# When changing SDL_DIR or OPENSSL_DIR, you must also update them in ground/openpilotgcs/openpilotgcs.pri
ARM_SDK_DIR := $(TOOLS_DIR)/gcc-arm-none-eabi-4_9-2014q4
QT_SDK_DIR := $(TOOLS_DIR)/qt-5.4.0 QT_SDK_DIR := $(TOOLS_DIR)/qt-5.4.0
MINGW_DIR := $(QT_SDK_DIR)/Tools/mingw491_32 ARM_SDK_DIR := $(TOOLS_DIR)/gcc-arm-none-eabi-4_9-2014q4
PYTHON_DIR := $(QT_SDK_DIR)/Tools/mingw491_32/opt/bin UNCRUSTIFY_DIR := $(TOOLS_DIR)/uncrustify-0.60
NSIS_DIR := $(TOOLS_DIR)/nsis-2.46-unicode DOXYGEN_DIR := $(TOOLS_DIR)/doxygen-1.8.3.1
SDL_DIR := $(TOOLS_DIR)/SDL-1.2.15 GTEST_DIR := $(TOOLS_DIR)/gtest-1.6.0
OPENSSL_DIR := $(TOOLS_DIR)/openssl-1.0.1e-win32
UNCRUSTIFY_DIR := $(TOOLS_DIR)/uncrustify-0.60
DOXYGEN_DIR := $(TOOLS_DIR)/doxygen-1.8.3.1
GTEST_DIR := $(TOOLS_DIR)/gtest-1.6.0
ifeq ($(UNAME), Windows) ifeq ($(UNAME), Linux)
MINGW_DIR := $(QT_SDK_DIR)/Tools/$(QT_SDK_ARCH) else ifeq ($(UNAME), Darwin)
PYTHON_DIR := $(QT_SDK_DIR)/Tools/$(QT_SDK_ARCH)/opt/bin else ifeq ($(UNAME), Windows)
NSIS_DIR := $(TOOLS_DIR)/nsis-2.46-unicode MINGW_DIR := $(QT_SDK_DIR)/Tools/$(QT_SDK_ARCH)
SDL_DIR := $(TOOLS_DIR)/SDL-1.2.15 # When changing PYTHON_DIR, you must also update it in ground/openpilotgcs/src/python.pri
OPENSSL_DIR := $(TOOLS_DIR)/openssl-1.0.1e-win32 PYTHON_DIR := $(QT_SDK_DIR)/Tools/$(QT_SDK_ARCH)/opt/bin
MESAWIN_DIR := $(TOOLS_DIR)/mesawin NSIS_DIR := $(TOOLS_DIR)/nsis-2.46-unicode
# When changing SDL_DIR or OPENSSL_DIR, you must also update them in ground/openpilotgcs/openpilotgcs.pri
SDL_DIR := $(TOOLS_DIR)/SDL-1.2.15
OPENSSL_DIR := $(TOOLS_DIR)/openssl-1.0.1e-win32
MESAWIN_DIR := $(TOOLS_DIR)/mesawin
CMAKE_DIR := $(TOOLS_DIR)/cmake-2.8.12.2-win32-x86
endif endif
QT_SDK_PREFIX := $(QT_SDK_DIR) QT_SDK_PREFIX := $(QT_SDK_DIR)
@ -899,6 +899,28 @@ export GTEST_DIR
gtest_version: gtest_version:
-$(V1) $(SED) -n "s/^PACKAGE_STRING='\(.*\)'/\1/p" < $(GTEST_DIR)/configure -$(V1) $(SED) -n "s/^PACKAGE_STRING='\(.*\)'/\1/p" < $(GTEST_DIR)/configure
##############################
#
# CMake
#
##############################
$(eval $(call TOOL_INSTALL_TEMPLATE,cmake,$(CMAKE_DIR),$(CMAKE_URL),$(CMAKE_MD5_URL),$(notdir $(CMAKE_URL))))
ifeq ($(shell [ -d "$(CMAKE_DIR)" ] && $(ECHO) "exists"), exists)
export CMAKE := "$(CMAKE_DIR)/bin/cmake"
export PATH := $(CMAKE_DIR)/bin:$(PATH)
else
export CMAKE := "cmake"
# not installed, hope it's in the path...
#$(info $(EMPTY) WARNING $(call toprel, $(CMAKE_DIR)) not found (make cmake_install), using system PATH)
export CMAKE := cmake
endif
.PHONY: cmake_version
cmake_version:
-$(V1) $(ECHO) "`$(CMAKE) --version`"