Merge pull request #112 from lidaobing/issue_97

Issue 97
iptux-src · Jan 24, 2018 · de62443 · de62443
2 parents 8698aeb + 6a50ea3
commit de62443
Show file tree

Hide file tree

Showing 52 changed files with 23 additions and 14 deletions.
diff --git a/ChangeLog b/ChangeLog
diff --git a/NEWS.md b/NEWS.md
@@ -1,6 +1,7 @@
 # 0.7.4 (2018-XX-XX)
 
 * [#?] fix bug in save share management.
+* [#97] don't download googletest if already installed.
 
 # 0.7.3 (2018-01-20)
 

diff --git a/desktop/hicolor/16x16/apps/iptux-i.png b/desktop/hicolor/16x16/apps/iptux-i.png
diff --git a/desktop/hicolor/16x16/apps/iptux.png b/desktop/hicolor/16x16/apps/iptux.png
diff --git a/desktop/hicolor/22x22/apps/iptux-i.png b/desktop/hicolor/22x22/apps/iptux-i.png
diff --git a/desktop/hicolor/22x22/apps/iptux.png b/desktop/hicolor/22x22/apps/iptux.png
diff --git a/desktop/hicolor/24x24/apps/iptux-i.png b/desktop/hicolor/24x24/apps/iptux-i.png
diff --git a/desktop/hicolor/24x24/apps/iptux.png b/desktop/hicolor/24x24/apps/iptux.png
diff --git a/desktop/hicolor/32x32/apps/iptux-i.png b/desktop/hicolor/32x32/apps/iptux-i.png
diff --git a/desktop/hicolor/32x32/apps/iptux.png b/desktop/hicolor/32x32/apps/iptux.png
diff --git a/desktop/hicolor/48x48/apps/iptux-i.png b/desktop/hicolor/48x48/apps/iptux-i.png
diff --git a/desktop/hicolor/48x48/apps/iptux.png b/desktop/hicolor/48x48/apps/iptux.png
diff --git a/desktop/hicolor/64x64/apps/iptux-i.png b/desktop/hicolor/64x64/apps/iptux-i.png
diff --git a/desktop/hicolor/64x64/apps/iptux.png b/desktop/hicolor/64x64/apps/iptux.png
diff --git a/desktop/iptux.desktop b/desktop/iptux.desktop
diff --git a/pixmaps/icon/icon-blowfish.png b/pixmaps/icon/icon-blowfish.png
diff --git a/pixmaps/icon/icon-bug.png b/pixmaps/icon/icon-bug.png
diff --git a/pixmaps/icon/icon-cow.png b/pixmaps/icon/icon-cow.png
diff --git a/pixmaps/icon/icon-daemon.png b/pixmaps/icon/icon-daemon.png
diff --git a/pixmaps/icon/icon-dog.png b/pixmaps/icon/icon-dog.png
diff --git a/pixmaps/icon/icon-elephant.png b/pixmaps/icon/icon-elephant.png
diff --git a/pixmaps/icon/icon-frog.png b/pixmaps/icon/icon-frog.png
diff --git a/pixmaps/icon/icon-ghost.png b/pixmaps/icon/icon-ghost.png
diff --git a/pixmaps/icon/icon-konqui.png b/pixmaps/icon/icon-konqui.png
diff --git a/pixmaps/icon/icon-lion.png b/pixmaps/icon/icon-lion.png
diff --git a/pixmaps/icon/icon-monkey.png b/pixmaps/icon/icon-monkey.png
diff --git a/pixmaps/icon/icon-penguin.png b/pixmaps/icon/icon-penguin.png
diff --git a/pixmaps/icon/icon-pig.png b/pixmaps/icon/icon-pig.png
diff --git a/pixmaps/icon/icon-qq.png b/pixmaps/icon/icon-qq.png
diff --git a/pixmaps/icon/icon-rabbit.png b/pixmaps/icon/icon-rabbit.png
diff --git a/pixmaps/icon/icon-scream.png b/pixmaps/icon/icon-scream.png
diff --git a/pixmaps/icon/icon-teddybear.png b/pixmaps/icon/icon-teddybear.png
diff --git a/pixmaps/icon/icon-turtle.png b/pixmaps/icon/icon-turtle.png
diff --git a/pixmaps/icon/icon-tux.png b/pixmaps/icon/icon-tux.png
diff --git a/pixmaps/menu/menu-board.png b/pixmaps/menu/menu-board.png
diff --git a/pixmaps/menu/menu-detect.png b/pixmaps/menu/menu-detect.png
diff --git a/pixmaps/menu/menu-group.png b/pixmaps/menu/menu-group.png
diff --git a/pixmaps/menu/menu-share.png b/pixmaps/menu/menu-share.png
diff --git a/pixmaps/tip/tip-error.png b/pixmaps/tip/tip-error.png
diff --git a/pixmaps/tip/tip-finish.png b/pixmaps/tip/tip-finish.png
diff --git a/pixmaps/tip/tip-hide.png b/pixmaps/tip/tip-hide.png
diff --git a/pixmaps/tip/tip-recv.png b/pixmaps/tip/tip-recv.png
diff --git a/pixmaps/tip/tip-send.png b/pixmaps/tip/tip-send.png
diff --git a/pixmaps/tip/tip-show.png b/pixmaps/tip/tip-show.png
diff --git a/po/ChangeLog b/po/ChangeLog
diff --git a/po/LINGUAS b/po/LINGUAS
diff --git a/po/POTFILES.in b/po/POTFILES.in
diff --git a/protocol b/protocol
diff --git a/sound/msg.ogg b/sound/msg.ogg
diff --git a/sound/trans.ogg b/sound/trans.ogg
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -1,18 +1,21 @@
-configure_file(googletest-download/CMakeLists.txt.in googletest-download/CMakeLists.txt)
-execute_process(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" .
-    WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/src/googletest-download" )
-execute_process(COMMAND "${CMAKE_COMMAND}" --build .
-    WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/src/googletest-download" )
+find_package(GTest)
+if(NOT GTEST_FOUND)
+	configure_file(googletest-download/CMakeLists.txt.in googletest-download/CMakeLists.txt)
+	execute_process(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" .
+		WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/src/googletest-download" )
+	execute_process(COMMAND "${CMAKE_COMMAND}" --build .
+		WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/src/googletest-download" )
 
 
-# Prevent GoogleTest from overriding our compiler/linker options
-# when building with Visual Studio
-set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
+	# Prevent GoogleTest from overriding our compiler/linker options
+	# when building with Visual Studio
+	set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
 
-# Add googletest directly to our build. This adds
-# the following targets: gtest, gtest_main, gmock
-# and gmock_main
-add_subdirectory("${CMAKE_BINARY_DIR}/src/googletest-src"
-                 "${CMAKE_BINARY_DIR}/src/googletest-build")
+	# Add googletest directly to our build. This adds
+	# the following targets: gtest, gtest_main, gmock
+	# and gmock_main
+	add_subdirectory("${CMAKE_BINARY_DIR}/src/googletest-src"
+		"${CMAKE_BINARY_DIR}/src/googletest-build")
+endif()
 add_subdirectory(iptux)
 add_subdirectory(main)
diff --git a/src/iptux/CMakeLists.txt b/src/iptux/CMakeLists.txt
@@ -48,5 +48,10 @@ add_executable(libiptux_test
 	UtilsTest.cpp
 	TestMain.cpp
 	)
-target_link_libraries(libiptux_test gtest iptux)
+if(GTEST_FOUND)
+	include_directories(${GTEST_INCLUDE_DIRS})
+	target_link_libraries(libiptux_test ${GTEST_BOTH_LIBRARIES} iptux pthread)
+else()
+	target_link_libraries(libiptux_test gtest iptux)
+endif()
 add_test(NAME libiptux_test COMMAND libiptux_test)