Skip to content

Commit

Permalink
Rename project to reflect that we are building 1.12.1
Browse files Browse the repository at this point in the history
  • Loading branch information
Martin-Idel committed Aug 11, 2019
1 parent 804bcf6 commit 34da950
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions rviz_ogre_vendor/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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.
Expand Down

0 comments on commit 34da950

Please sign in to comment.