Skip to content
Browse files

minor build fix

  • Loading branch information...
1 parent 8310959 commit 4f3b2af792fefb99d871f741188619ef52153671 @naoyam committed Sep 3, 2011
Showing with 14 additions and 13 deletions.
  1. +2 −1 misc/rose-build.sh
  2. +10 −10 translator/CMakeLists.txt
  3. +1 −1 translator/physisc-cuda.cmake
  4. +1 −1 translator/physisc-mpi.cmake
View
3 misc/rose-build.sh
@@ -63,14 +63,15 @@ if [ -z "$JAVA_HOME" ]; then
case $OSTYPE in
linux*)
LDFLAGS=""
- for i in $(locate libjvm.so | grep sun); do
+ for i in $(locate libjvm.so); do
echo -n "Using $i? [Y/n] "
read yn
if [ "$yn" != "n" ]; then
export JAVA_HOME=${i%/jre*}
break
fi
done
+
if [ -z "$JAVA_HOME" ]; then
echo "Error: no Java found"
exit 1
View
20 translator/CMakeLists.txt
@@ -26,21 +26,30 @@ set (PHYSISC_SRC physisc.cc configuration.cc
if (MPI_ENABLED)
set(MPI_INCLUDE_DIR ${MPI_INCLUDE_PATH})
set(PHYSISC_SRC ${PHYSISC_SRC}
- mpi_translator.cc mpi_runtime_builder.cc)
+ mpi_translator.cc mpi_runtime_builder.cc)
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/physisc-mpi.cmake
+ ${CMAKE_CURRENT_BINARY_DIR}/physisc-mpi)
+ install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/physisc-mpi DESTINATION bin)
endif()
if (CUDA_ENABLED)
set(CUDA_INCLUDE_DIR ${CUDA_INCLUDE_DIRS})
set(PHYSISC_SRC ${PHYSISC_SRC}
cuda_translator.cc
cuda_builder.cc)
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/physisc-cuda.cmake
+ ${CMAKE_CURRENT_BINARY_DIR}/physisc-cuda)
+ install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/physisc-cuda DESTINATION bin)
endif()
if (MPI_ENABLED AND CUDA_ENABLED)
set(PHYSISC_SRC ${PHYSISC_SRC}
mpi_cuda_translator.cc
mpi_cuda_runtime_builder.cc
mpi_cuda_optimizer.cc)
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/physisc-mpi-cuda.cmake
+ ${CMAKE_CURRENT_BINARY_DIR}/physisc-mpi-cuda)
+ install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/physisc-mpi-cuda DESTINATION bin)
endif ()
add_executable(physisc ${PHYSISC_SRC})
@@ -58,16 +67,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/physisc-ref.cmake
${CMAKE_CURRENT_BINARY_DIR}/physisc-ref)
install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/physisc-ref DESTINATION bin)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/physisc-cuda.cmake
- ${CMAKE_CURRENT_BINARY_DIR}/physisc-cuda)
-install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/physisc-cuda DESTINATION bin)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/physisc-mpi.cmake
- ${CMAKE_CURRENT_BINARY_DIR}/physisc-mpi)
-install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/physisc-mpi DESTINATION bin)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/physisc-mpi-cuda.cmake
- ${CMAKE_CURRENT_BINARY_DIR}/physisc-mpi-cuda)
-install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/physisc-mpi-cuda DESTINATION bin)
View
2 translator/physisc-cuda.cmake
@@ -1,3 +1,3 @@
#!/usr/bin/env bash
-${CMAKE_INSTALL_PREFIX}/physisc --cuda -I${CMAKE_INSTALL_PREFIX}/include $*
+${CMAKE_INSTALL_PREFIX}/bin/physisc --cuda -I${CMAKE_INSTALL_PREFIX}/include $*
View
2 translator/physisc-mpi.cmake
@@ -1,3 +1,3 @@
#!/usr/bin/env bash
-${CMAKE_INSTALL_PREFIX}/physisc --mpi -I${CMAKE_INSTALL_PREFIX}/include $*
+${CMAKE_INSTALL_PREFIX}/bin/physisc --mpi -I${CMAKE_INSTALL_PREFIX}/include $*

0 comments on commit 4f3b2af

Please sign in to comment.
Something went wrong with that request. Please try again.