|
1 | 1 | #
|
2 |
| -# Copyright 2013-2014 Axel Huebl, Benjamin Schneider, Felix Schmitt, Heiko Burau, Rene Widera |
| 2 | +# Copyright 2013-2015 Axel Huebl, Benjamin Schneider, Felix Schmitt, Heiko Burau, Rene Widera |
3 | 3 | #
|
4 | 4 | # This file is part of PIConGPU.
|
5 | 5 | #
|
@@ -85,20 +85,6 @@ if(CUDA_KEEP_FILES)
|
85 | 85 | endif(CUDA_KEEP_FILES)
|
86 | 86 |
|
87 | 87 |
|
88 |
| -################################################################################ |
89 |
| -# Find mallocMC |
90 |
| -################################################################################ |
91 |
| - |
92 |
| -find_package(mallocMC 2.1.0) |
93 |
| - |
94 |
| -if(mallocMC_FOUND) |
95 |
| - include_directories(SYSTEM ${mallocMC_INCLUDE_DIRS}) |
96 |
| -else(mallocMC_FOUND) |
97 |
| - message(STATUS "Using mallocMC from thirdParty/ directory") |
98 |
| - include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/../../thirdParty/mallocMC/src/include) |
99 |
| -endif(mallocMC_FOUND) |
100 |
| - |
101 |
| - |
102 | 88 | ################################################################################
|
103 | 89 | # VampirTrace
|
104 | 90 | ################################################################################
|
@@ -269,6 +255,20 @@ if( (Boost_VERSION EQUAL 105500) AND
|
269 | 255 | endif()
|
270 | 256 |
|
271 | 257 |
|
| 258 | +################################################################################ |
| 259 | +# Find mallocMC |
| 260 | +################################################################################ |
| 261 | + |
| 262 | +find_package(mallocMC 2.1.0) |
| 263 | + |
| 264 | +if(mallocMC_FOUND) |
| 265 | + include_directories(SYSTEM ${mallocMC_INCLUDE_DIRS}) |
| 266 | +else(mallocMC_FOUND) |
| 267 | + message(STATUS "Using mallocMC from thirdParty/ directory") |
| 268 | + include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/../../thirdParty/mallocMC/src/include) |
| 269 | +endif(mallocMC_FOUND) |
| 270 | + |
| 271 | + |
272 | 272 | ################################################################################
|
273 | 273 | # PMacc options
|
274 | 274 | ################################################################################
|
|
0 commit comments