diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4b357ab..52507f2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,6 +9,8 @@ include(Version)
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 set(CMAKE_MACOSX_RPATH 0)
 set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} -Wall)
+set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_C_STANDARD 11)
 
 if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
 	set(CMAKE_INSTALL_PREFIX "/opt/MESA" CACHE PATH "default install path" FORCE)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 7a89809..503b485 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -10,6 +10,6 @@ link_directories(/opt/MESA/lib)
 link_directories("${CMAKE_BINARY_DIR}")
 
 add_executable(gtest_mesa gtest_mesa_sts.cpp)
-target_link_libraries(gtest_mesa gtest gtest_main pcap pthread mesa_sts)
+target_link_libraries(gtest_mesa gtest-static pcap pthread mesa_sts)
 
-file(COPY pcap DESTINATION ./)
\ No newline at end of file
+file(COPY pcap DESTINATION ./)