From 34da9506064d6e20e45eb0ac8102c6871a3427f5 Mon Sep 17 00:00:00 2001 From: Martin Idel Date: Sun, 11 Aug 2019 21:20:13 +0200 Subject: [PATCH] Rename project to reflect that we are building 1.12.1 --- rviz_ogre_vendor/CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/rviz_ogre_vendor/CMakeLists.txt b/rviz_ogre_vendor/CMakeLists.txt index d07c23f39..623d667e5 100644 --- a/rviz_ogre_vendor/CMakeLists.txt +++ b/rviz_ogre_vendor/CMakeLists.txt @@ -152,7 +152,7 @@ macro(build_ogre) endif() include(ExternalProject) - ExternalProject_Add(ogre-master-ca665a6 + ExternalProject_Add(ogre-v1.12.1 URL https://github.com/OGRECave/ogre/archive/v1.12.1.zip URL_MD5 cdbea4006d223c173e0a93864111b936 TIMEOUT 1200 @@ -180,14 +180,14 @@ macro(build_ogre) -Wno-dev PATCH_COMMAND ${patch_files} - ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/FindFreetype.cmake ${CMAKE_CURRENT_BINARY_DIR}/ogre-master-ca665a6-prefix/src/ogre-master-ca665a6/CMake/Packages/FindFreetype.cmake + ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/FindFreetype.cmake ${CMAKE_CURRENT_BINARY_DIR}/ogre-v1.12.1-prefix/src/ogre-v1.12.1/CMake/Packages/FindFreetype.cmake ) if(BUILDING_FREETYPE_LOCALLY) - add_dependencies(ogre-master-ca665a6 freetype-2.8.1) + add_dependencies(ogre-v1.12.1 freetype-2.8.1) endif() if(BUILDING_ZLIB_LOCALLY) - add_dependencies(ogre-master-ca665a6 zlib-1.2.11) + add_dependencies(ogre-v1.12.1 zlib-1.2.11) endif() # The external project will install to the build folder, but we'll install that on make install.