Skip to content

Commit

Permalink
Added GMock as an external project + gmock/gtest install patch
Browse files Browse the repository at this point in the history
  • Loading branch information
nemerle committed Mar 27, 2013
1 parent 7303f47 commit 1bd2b57
Show file tree
Hide file tree
Showing 2 changed files with 46 additions and 2 deletions.
32 changes: 32 additions & 0 deletions 3rd_party/gmock.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
diff -rupN gmock-1.6.0/CMakeLists.txt gmock/CMakeLists.txt
--- gmock-1.6.0/CMakeLists.txt 2011-04-15 21:51:15.000000000 +0200
+++ gmock/CMakeLists.txt 2013-03-27 14:15:30.535151846 +0100
@@ -81,6 +81,12 @@ target_link_libraries(gmock gtest)

cxx_library(gmock_main "${cxx_strict}" src/gmock_main.cc)
target_link_libraries(gmock_main gmock)
+install(TARGETS gmock_main gmock
+ RUNTIME DESTINATION lib
+ ARCHIVE DESTINATION lib
+ LIBRARY DESTINATION lib
+)
+install(DIRECTORY include/gmock DESTINATION include)

########################################################################
#
diff -rupN gmock-1.6.0/gtest/CMakeLists.txt gmock/gtest/CMakeLists.txt
--- gmock-1.6.0/gtest/CMakeLists.txt 2010-12-03 00:29:20.000000000 +0100
+++ gmock/gtest/CMakeLists.txt 2013-03-27 14:15:49.165053512 +0100
@@ -70,6 +70,12 @@ link_directories(${gtest_BINARY_DIR}/src
cxx_library(gtest "${cxx_strict}" src/gtest-all.cc)
cxx_library(gtest_main "${cxx_strict}" src/gtest_main.cc)
target_link_libraries(gtest_main gtest)
+install(TARGETS gtest_main gtest
+ RUNTIME DESTINATION lib
+ ARCHIVE DESTINATION lib
+ LIBRARY DESTINATION lib
+)
+install(DIRECTORY include/gtest DESTINATION include/)

########################################################################
#
16 changes: 14 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMakeScripts;${CMAKE_MODULE_PATH})
SET(UNICODE TRUE)

OPTION(ENABLE_SCRIPTING_ENGINE "Build experimental scripting engine ?" OFF)
OPTION(ENABLE_TESTS "Enable testing unit and functional tests" OFF)

SET(PostgreSQL_ADDITIONAL_VERSIONS "9.2")
########################################################################################
Expand All @@ -27,7 +28,6 @@ ExternalProject_Add(
ACE_BUILD
SOURCE_DIR ${PROJECT_SOURCE_DIR}/3rd_party/naked_ace
UPDATE_COMMAND ""
BINARY_DIR ${PROJECT_SOURCE_DIR}/3rd_party/naked_ace/bld
INSTALL_DIR ${PROJECT_SOURCE_DIR}/3rd_party/
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
)
Expand Down Expand Up @@ -62,7 +62,19 @@ if(ENABLE_SCRIPTING_ENGINE)
LINK_DIRECTORIES(${PROJECT_SOURCE_DIR}/3rd_party/mruby/build/host/lib)
SET(MRuby_LIBRARIES mruby)
endif()

if(ENABLE_TESTS)
enable_testing()
ExternalProject_Add(
GMOCK_BUILD
DOWNLOAD_DIR ${PROJECT_SOURCE_DIR}/3rd_party/gmock
URL http://googlemock.googlecode.com/files/gmock-1.6.0.zip
UPDATE_COMMAND ""
PATCH_COMMAND patch -N -t -p1 < ../gmock.patch
SOURCE_DIR ${PROJECT_SOURCE_DIR}/3rd_party/gmock
INSTALL_DIR ${PROJECT_SOURCE_DIR}/3rd_party/
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
)
endif()
link_directories(${PROJECT_SOURCE_DIR}/3rd_party/lib)
include_directories(${PROJECT_SOURCE_DIR}/3rd_party/include)
include_directories(${PROJECT_SOURCE_DIR}/include)
Expand Down

0 comments on commit 1bd2b57

Please sign in to comment.