Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

MB-13626: Don't copy Breakpad headers/libs to install/

We don't need to ship Breakpad's headers or libraries with the product
seperately (everything we need is statically linked into memcached).
Therefore change the CMakeLists.txt used at extract time to no longer
copy those fies to install/

Change-Id: I5e15f532836456ac4e06417f380bf805f6da1f19
Reviewed-on: http://review.couchbase.org/47348
Tested-by: buildbot <build@couchbase.com>
Reviewed-by: Trond Norbye <trond.norbye@gmail.com>
  • Loading branch information...
commit 8747556ed2996b336350bd98019b5c8fde7b7dd6 1 parent bd65f12
Dave Rigby daverigby authored ceejatec committed
2  deps/packages/CMakeLists.txt
View
@@ -113,7 +113,7 @@ ENDIF (NOT WIN32)
#
IF (CMAKE_SYSTEM_NAME STREQUAL "Linux" OR CMAKE_SYSTEM_NAME STREQUAL "Windows")
- _ADD_DEP_PACKAGE(breakpad 1e455b5 1e455b5 7)
+ _ADD_DEP_PACKAGE(breakpad 1e455b5 1e455b5 8)
ELSE (CMAKE_SYSTEM_NAME STREQUAL "Linux" OR CMAKE_SYSTEM_NAME STREQUAL "Windows")
MESSAGE(STATUS "Skipping breakpad for ${CMAKE_SYSTEM_NAME}")
ENDIF (CMAKE_SYSTEM_NAME STREQUAL "Linux" OR CMAKE_SYSTEM_NAME STREQUAL "Windows")
8 deps/packages/breakpad/CMakeLists.txt
View
@@ -74,8 +74,9 @@ IF (WIN32)
COMMAND ${CMAKE_COMMAND} -E copy_directory src/google_breakpad/common/
<INSTALL_DIR>/include/google_breakpad/common/
- # Actual CMakeLists.txt file to copy the correct libs into our install directory.
- COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists_for_install.txt <INSTALL_DIR>/CMakeLists.txt
+ # On WIN32 don't actually need to package any breakpad files - everything used is statically
+ # linked into our files.
+ COMMAND ${CMAKE_COMMAND} -E echo "" > <INSTALL_DIR>/CMakeLists.txt
)
ELSE (WIN32)
@@ -93,8 +94,7 @@ ELSE (WIN32)
INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/install
INSTALL_COMMAND make install
- COMMAND ${CMAKE_COMMAND} -E echo FILE "(COPY lib include DESTINATION \"\${CMAKE_INSTALL_PREFIX}\")" > <INSTALL_DIR>/CMakeLists.txt
- COMMAND ${CMAKE_COMMAND} -E echo FILE "(COPY bin/minidump-2-core DESTINATION \"\${CMAKE_INSTALL_PREFIX}/bin\")" >> <INSTALL_DIR>/CMakeLists.txt
+ COMMAND ${CMAKE_COMMAND} -E echo FILE "(COPY bin/minidump-2-core DESTINATION \"\${CMAKE_INSTALL_PREFIX}/bin\")" > <INSTALL_DIR>/CMakeLists.txt
)
ENDIF(WIN32)
Please sign in to comment.
Something went wrong with that request. Please try again.