summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorJosh Blum2013-02-23 19:51:18 -0800
committerJosh Blum2013-02-23 19:51:18 -0800
commit6841702911d07a2bad86ecd3bfc243b6a688ad2a (patch)
treefd0d016c1c4e27fd56955bb535fe25598f100ff0 /lib
parentc14550afef3d3c3086c92315ea16a7b5bfa8ffa6 (diff)
downloadsandhi-6841702911d07a2bad86ecd3bfc243b6a688ad2a.tar.gz
sandhi-6841702911d07a2bad86ecd3bfc243b6a688ad2a.tar.bz2
sandhi-6841702911d07a2bad86ecd3bfc243b6a688ad2a.zip
gras: put custom allocator first into the sources list to guarantee precedence
Diffstat (limited to 'lib')
-rw-r--r--lib/CMakeLists.txt4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index bc38d06..715f844 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -21,6 +21,9 @@ include_directories(${THERON_INCLUDE_DIRS})
link_directories(${THERON_LIBRARY_DIRS})
add_definitions(${THERON_DEFINES})
+#put custom allocator first into the sources list to guarantee precedence
+list(APPEND GRAS_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/theron_allocator.cpp)
+
list(APPEND GRAS_LIBRARIES ${THERON_LIBRARIES})
list(APPEND GRAS_SOURCES ${THERON_SOURCES})
@@ -47,7 +50,6 @@ list(APPEND GRAS_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/block.cpp
${CMAKE_CURRENT_SOURCE_DIR}/block_actor.cpp
${CMAKE_CURRENT_SOURCE_DIR}/block_task.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/theron_allocator.cpp
${CMAKE_CURRENT_SOURCE_DIR}/block_allocator.cpp
${CMAKE_CURRENT_SOURCE_DIR}/block_handlers.cpp
${CMAKE_CURRENT_SOURCE_DIR}/topology_handler.cpp