KDAB · krf · Apr 11, 2013
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -321,6 +321,7 @@ add_subdirectory(common)
 add_subdirectory(ui)
 add_subdirectory(core)
 add_subdirectory(launcher)
+add_subdirectory(hooking)
 
 set(GRAPHVIZ_MIN_VERSION "2.20")
 find_package(Graphviz)

diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
@@ -2,6 +2,7 @@ include_directories(
   ${CMAKE_SOURCE_DIR}
   ${CMAKE_SOURCE_DIR}/3rdparty
   ${CMAKE_SOURCE_DIR}/common
+  ${CMAKE_SOURCE_DIR}/include
   ${CMAKE_SOURCE_DIR}/ui
   ${CMAKE_CURRENT_SOURCE_DIR}
 
@@ -149,5 +150,4 @@ if(NOT WIN32)
 endif()
 install(TARGETS gammaray_core ${INSTALL_TARGETS_DEFAULT_ARGS})
 
-add_subdirectory(hooking)
 add_subdirectory(tools)
diff --git a/core/probe.h b/core/probe.h
@@ -24,8 +24,8 @@
 #ifndef GAMMARAY_PROBE_H
 #define GAMMARAY_PROBE_H
 
-#include "include/gammaray_core_export.h"
-#include "include/probeinterface.h"
+#include "gammaray_core_export.h"
+#include "probeinterface.h"
 
 #include <QObject>
 #include <QQueue>

diff --git a/core/hooking/CMakeLists.txt → hooking/CMakeLists.txt b/core/hooking/CMakeLists.txt → hooking/CMakeLists.txt
@@ -2,7 +2,11 @@
 SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
 
 include_directories(
+  ${CMAKE_BINARY_DIR} # config-gammaray.h
   ${CMAKE_CURRENT_BINARY_DIR}
+
+  ${CMAKE_SOURCE_DIR}/core
+  ${CMAKE_SOURCE_DIR}/include
 )
 
 set(gammaray_probe_srcs
@@ -20,9 +24,6 @@ if(WIN32 OR APPLE)
   )
 endif()
 
-# for the hooks, we actually use gammaray_core
-remove_definitions(-DMAKE_GAMMARAY_LIB)
-
 # probe lib
 qt4_automoc(${gammaray_probe_srcs})
 add_library(gammaray_probe SHARED ${gammaray_probe_srcs})

diff --git a/core/hooking/abstractfunctionoverwriter.cpp → hooking/abstractfunctionoverwriter.cpp b/core/hooking/abstractfunctionoverwriter.cpp → hooking/abstractfunctionoverwriter.cpp
diff --git a/core/hooking/abstractfunctionoverwriter.h → hooking/abstractfunctionoverwriter.h b/core/hooking/abstractfunctionoverwriter.h → hooking/abstractfunctionoverwriter.h
diff --git a/core/hooking/functionoverwriterfactory.cpp → hooking/functionoverwriterfactory.cpp b/core/hooking/functionoverwriterfactory.cpp → hooking/functionoverwriterfactory.cpp
diff --git a/core/hooking/functionoverwriterfactory.h → hooking/functionoverwriterfactory.h b/core/hooking/functionoverwriterfactory.h → hooking/functionoverwriterfactory.h
diff --git a/core/hooking/hooks.cpp → hooking/hooks.cpp b/core/hooking/hooks.cpp → hooking/hooks.cpp
diff --git a/core/hooking/probecreator.cpp → hooking/probecreator.cpp b/core/hooking/probecreator.cpp → hooking/probecreator.cpp
diff --git a/core/hooking/probecreator.h → hooking/probecreator.h b/core/hooking/probecreator.h → hooking/probecreator.h
diff --git a/core/hooking/unixfunctionoverwriter.cpp → hooking/unixfunctionoverwriter.cpp b/core/hooking/unixfunctionoverwriter.cpp → hooking/unixfunctionoverwriter.cpp
diff --git a/core/hooking/unixfunctionoverwriter.h → hooking/unixfunctionoverwriter.h b/core/hooking/unixfunctionoverwriter.h → hooking/unixfunctionoverwriter.h
diff --git a/core/hooking/winfunctionoverwriter.cpp → hooking/winfunctionoverwriter.cpp b/core/hooking/winfunctionoverwriter.cpp → hooking/winfunctionoverwriter.cpp
diff --git a/core/hooking/winfunctionoverwriter.h → hooking/winfunctionoverwriter.h b/core/hooking/winfunctionoverwriter.h → hooking/winfunctionoverwriter.h