Skip to content

Commit

Permalink
Merge pull request #229 from ax3l/fix-configureExisting
Browse files Browse the repository at this point in the history
Fix #104 - Check if the dir for "configure" exists
  • Loading branch information
psychocoderHPC committed Feb 25, 2014
2 parents 4a9343a + e4a0175 commit 53a621b
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ cmakeFlagsNr=0
eval set -- "$OPTS"

while true ; do
case "$1" in
case "$1" in
-a|--arch)
cuda_arch="-DCUDA_ARCH=$2"
shift
Expand Down Expand Up @@ -77,8 +77,8 @@ done

extension_param="$*"

if [ -z "$extension_param" ] ; then
echo "No case path is given." >&2
if [ ! -d "$extension_param" ] ; then
echo "Path \"$extension_param\" does not exist." >&2
exit 1
fi
#check for cmakeFlags file (interprete with sh)
Expand Down
6 changes: 3 additions & 3 deletions src/picongpu/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -495,12 +495,12 @@ install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/scripts/" DESTINATION bin
if( (NOT "${CMAKE_INSTALL_PREFIX}" STREQUAL "${PIC_EXTENSION_PATH}") OR
(NOT EXISTS "${CMAKE_INSTALL_PREFIX}/include"))

#copy all importend subfolders to install folder
#copy all important subfolders to install folder
foreach(dir ${PIC_COPY_ON_INSTALL})

#if source not exists than copy
if(NOT EXISTS "${CMAKE_INSTALL_PREFIX}/${dir}")
#copy importend subfolders from extension path (default PIConGPU parameter)
#copy important subfolders from extension path (default PIConGPU parameter)
if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${dir}/")
install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/${dir}/."
DESTINATION "${CMAKE_INSTALL_PREFIX}/${dir}"
Expand All @@ -509,7 +509,7 @@ if( (NOT "${CMAKE_INSTALL_PREFIX}" STREQUAL "${PIC_EXTENSION_PATH}") OR
)
endif()

#copy importend subfolders from extension path (from extension path)
#copy important subfolders from extension path (from extension path)
if(EXISTS "${PIC_EXTENSION_PATH}/${dir}/")
install(DIRECTORY "${PIC_EXTENSION_PATH}/${dir}/."
DESTINATION "${CMAKE_INSTALL_PREFIX}/${dir}"
Expand Down

0 comments on commit 53a621b

Please sign in to comment.