Remove FindZLIB again - already present in CMake 3.5

ros2 · Aug 5, 2019 · b4e8bda · b4e8bda
1 parent d1589fc
commit b4e8bda
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 50 deletions.
diff --git a/rviz_ogre_vendor/CMakeLists.txt b/rviz_ogre_vendor/CMakeLists.txt
@@ -138,7 +138,7 @@ macro(build_ogre)
   endif()
   if(BUILDING_ZLIB_LOCALLY)
     list(APPEND extra_cmake_args
-      "-DZLIB_ROOT=${CMAKE_CURRENT_BINARY_DIR}/zlib_install")
+      "-DZLIB_ROOT=${CMAKE_CURRENT_BINARY_DIR}/zlib-install")
   endif()
 
   if(DEFINED CMAKE_TOOLCHAIN_FILE)
@@ -176,8 +176,7 @@ macro(build_ogre)
       ${extra_cmake_args}
       -Wno-dev
     PATCH_COMMAND
-      ${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}/FindZLIB.cmake ${CMAKE_CURRENT_BINARY_DIR}/ogre-master-ca665a6-prefix/src/ogre-master-ca665a6/CMake/Packages/FindZLIB.cmake
+      ${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
   )
 
   if(BUILDING_FREETYPE_LOCALLY)

diff --git a/rviz_ogre_vendor/FindZLIB.cmake b/rviz_ogre_vendor/FindZLIB.cmake