Allow disabling of HardwareCounter

HardwareCounter depends on linux specific ioctls and kernel hooks. This makes them unusable on other platforms.
facebook · Aug 18, 2012 · 7761a65 · 7761a65
1 parent 52cb344
commit 7761a65
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/CMake/HPHPSetup.cmake b/CMake/HPHPSetup.cmake
@@ -42,10 +42,6 @@ if(APPLE)
 	endif()
 endif()
 
-if(NOT LINUX)
-	add_definitions(-DNO_HARDWARE_COUNTERS)
-endif()
-
 include(HPHPFunctions)
 include(HPHPFindLibs)
 

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -48,6 +48,12 @@ foreach (dir ${RECURSIVE_SOURCE_SUBDIRS})
 
 endforeach(dir ${RECURSIVE_SOURCE_SUBDIRS})
 
+# Disable hardware counters off of Linux
+if(NOT LINUX)
+	add_definitions(-DNO_HARDWARE_COUNTERS)
+	list(REMOVE_ITEM CXX_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/util/hardware_counter.cpp)
+endif()
+
 # remove ext_hhvm
 foreach (file ${CXX_SOURCES})
        	if (${file} MATCHES "ext_hhvm")