Skip to content

Commit fea3499

Browse files
committed
Merge pull request ComputationalRadiationPhysics#903 from psychocoderHPC/fix-cmakeWithMallocMC
fix that always `thirdParty/malloc` is used
2 parents f0ba515 + 1efb551 commit fea3499

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

Diff for: src/picongpu/CMakeLists.txt

+15-15
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
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
33
#
44
# This file is part of PIConGPU.
55
#
@@ -85,20 +85,6 @@ if(CUDA_KEEP_FILES)
8585
endif(CUDA_KEEP_FILES)
8686

8787

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-
10288
################################################################################
10389
# VampirTrace
10490
################################################################################
@@ -269,6 +255,20 @@ if( (Boost_VERSION EQUAL 105500) AND
269255
endif()
270256

271257

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+
272272
################################################################################
273273
# PMacc options
274274
################################################################################

0 commit comments

Comments
 (0)