Skip to content

Commit c326db2

Browse files
authored
Merge pull request ComputationalRadiationPhysics#2526 from ax3l/fix-checkOldDirStruct
pic-configure: fix old structure check
2 parents 4e03636 + c33a707 commit c326db2

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

pic-configure

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -141,25 +141,25 @@ if [ -f "$extension_param/cmakeFlags" ] ; then
141141
fi
142142
fi
143143

144-
# set default install path if no path is set by paramater
145-
if [ -z "$install_path" ] ; then
146-
install_path="-DCMAKE_INSTALL_PREFIX=$extension_param"
147-
fi
148-
extension_param="-DPIC_EXTENSION_PATH=$extension_param"
149-
150144
# legacy check: we removed simulation_defines/ after PIConGPU 0.3.X
151145
if [ -d "$extension_param/include/picongpu/simulation_defines" ]; then
152146
echo "ERROR: simulation_defines/ directory found!" >&2
153147
echo " Please update your input directory to the new structure!" >&2
154148
exit 3
155149
fi
156150

151+
# set default install path if no path is set by parameter
152+
if [ -z "$install_path" ] ; then
153+
install_path="-DCMAKE_INSTALL_PREFIX=$extension_param"
154+
fi
155+
cmake_extension_param="-DPIC_EXTENSION_PATH=$extension_param"
156+
157157
# warn on missing backend selection
158158
if [ -z "$alpaka_backend" ] ; then
159159
echo "Warning: no compute backend set! " >&2
160160
echo "(Use -b|--backend or export PIC_BACKEND)" >&2
161161
fi
162162

163-
own_command="cmake $cmake_flags $install_path $extension_param $cmake_options $alpaka_backend $this_dir/include/picongpu"
163+
own_command="cmake $cmake_flags $install_path $cmake_extension_param $cmake_options $alpaka_backend $this_dir/include/picongpu"
164164
echo -e "\033[32mcmake command:\033[0m $own_command"
165165
eval $own_command

0 commit comments

Comments
 (0)