Updated gtest finder

cmake/FindGoogleTest.cmake

@@ -45,7 +45,7 @@ else(GTEST_INCLUDE_DIRS AND GTEST_LIBRARIES AND GTEST_MAIN_LIBRARIES)
       ~/sw/gtest-1.8.0/include
       ~/sw/gtest-1.7.0/include
       ~/sw/gtest/include     
-      /ACG/acgdev/gcc-4.7-x86_64/gtest/include
+      /ACG/acgdev/gcc-x86_64/gtest/include
       /opt/local/include
       /usr/local/include
       /usr/include
@@ -56,10 +56,10 @@ else(GTEST_INCLUDE_DIRS AND GTEST_LIBRARIES AND GTEST_MAIN_LIBRARIES)
       ~/sw/gtest-1.8.0/lib
       ~/sw/gtest-1.7.0/lib
       ~/sw/gtest/lib
-      /ACG/acgdev/gcc-4.7-x86_64/gtest/lib
+      /ACG/acgdev/gcc-x86_64/gtest/lib
       /opt/local/lib
       /usr/local/lib
-      /usr/lib
+      /usr/include
       "C:/libs/win32/gtest/lib"
       NO_DEFAULT_PATH )
     find_library(_GTEST_MAIN_LIBRARY gtest_main
@@ -67,10 +67,10 @@ else(GTEST_INCLUDE_DIRS AND GTEST_LIBRARIES AND GTEST_MAIN_LIBRARIES)
       ~/sw/gtest-1.8.0/lib
       ~/sw/gtest-1.7.0/lib
       ~/sw/gtest/lib
-      /ACG/acgdev/gcc-4.7-x86_64/gtest/lib
+      /ACG/acgdev/gcc-x86_64/gtest/lib
       /opt/local/lib
       /usr/local/lib
-      /usr/lib
+      /usr/include
       "C:/libs/win32/gtest/lib"
       NO_DEFAULT_PATH )
 
@@ -84,24 +84,29 @@ else(GTEST_INCLUDE_DIRS AND GTEST_LIBRARIES AND GTEST_MAIN_LIBRARIES)
     set(GTEST_INCLUDE_DIRS ${_GTEST_INCLUDE_DIR} CACHE PATH
       "Include directories for Google Test framework")
 	  
-	if ( NOT WIN32 ) 
+    if ( NOT WIN32 )
       set(GTEST_LIBRARIES ${_GTEST_LIBRARY} CACHE FILEPATH
         "Libraries to link for Google Test framework")
       set(GTEST_MAIN_LIBRARIES ${_GTEST_MAIN_LIBRARY} CACHE FILEPATH
         "Libraries to link for Google Test automatic main() definition")
-	else()
-	  set(GTEST_LIBRARIES "optimized;gtest;debug;gtestd" CACHE FILEPATH
+      set(GTEST_MAIN_LIBRARY ${_GTEST_MAIN_LIBRARY} CACHE FILEPATH
+        "Libraries to link for Google Test automatic main() definition")
+    else()
+      set(GTEST_LIBRARIES "optimized;gtest;debug;gtestd" CACHE FILEPATH
         "Libraries to link for Google Test framework")
       set(GTEST_MAIN_LIBRARIES "optimized;gtest_main;debug;gtest_maind" CACHE FILEPATH
         "Libraries to link for Google Test automatic main() definition")
-	endif()
+      set(GTEST_MAIN_LIBRARY "optimized;gtest_main;debug;gtest_maind" CACHE FILEPATH
+        "Libraries to link for Google Test automatic main() definition")
+    endif()
 	
-	# Macro required to use google test with vs2012
-	if ( CMAKE_GENERATOR MATCHES "^Visual Studio 11.*"  )
-	   add_definitions(-D_VARIADIC_MAX=10)
-	endif()
+    # Macro required to use google test with vs2012
+    if ( CMAKE_GENERATOR MATCHES "^Visual Studio 11.*"  )
+       add_definitions(-D_VARIADIC_MAX=10)
+    endif()
 
-	
+    set(GTEST_LIBRARY ${_GTEST_LIBRARY} CACHE FILEPATH
+          "GTest Libraries")
     set(GTEST_LIBRARY_DIR ${_GTEST_LIBRARY_DIR} CACHE FILEPATH
       "Library dir containing Google Test libraries")
     mark_as_advanced(GTEST_INCLUDE_DIRS GTEST_LIBRARIES GTEST_MAIN_LIBRARIES GTEST_LIBRARY_DIR )