Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bugfix: Build system fixes #309

Merged
merged 3 commits into from
Jun 21, 2024
Merged

Bugfix: Build system fixes #309

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2c9b71e
Updated scripts/jana-config.h to include JANA in RPath
RaiqaRasool Jun 21, 2024
36b8377
Fix .gitignore
nathanwbrei Jun 21, 2024
8f09ea4
Change examples install directory
nathanwbrei Jun 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,12 @@ Darwin_*
.Darwin_*
Makefile

build/
cmake-build-debug/
install/
bin/
include/
lib/
programs/
/build*/
/install*/

/bin/
/include/
/lib/

# Doxygen generated files
docs/html/*
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ endfunction()
#----------------------

option(USE_ROOT "Include ROOT dependency." OFF)
option(USE_ZEROMQ "Include ZeroMQ dependency. (Needed for examples/StreamingExample, programs/StreamDet, plugins/janacontrol), " OFF)
option(USE_ZEROMQ "Include ZeroMQ dependency. (Needed for examples/StreamingExample, plugins/streamDet, plugins/janacontrol), " OFF)
option(USE_XERCES "Include XercesC 3 dependency. (Needed for JGeometryXML)" OFF)
option(USE_PYTHON "Include Python dependency. This requires python-devel and python-distutils." OFF)
option(USE_ASAN "Compile with address sanitizer" OFF)
Expand Down
2 changes: 1 addition & 1 deletion scripts/ci/submit_SubeventCUDAExample.slurm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,5 +40,5 @@ srun cmake --build build -j 32 --target install

# run
echo "\n Launching SubeventCUDAExample for 1s..."
srun ./install/programs/SubeventCUDAExample & \
srun ./install/bin/SubeventCUDAExample & \
sleep 1 # exit effect
7 changes: 6 additions & 1 deletion scripts/jana-config.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,12 @@ while test $# -gt 0; do
esac
case $1 in
--libs)
mess="$mess -L${JANA_INSTALL_DIR}/lib -lJANA ${LDFLAGS} ${JANA_ONLY_LIBS} ${LIBS}"
mess="$mess -Wl,-rpath,${JANA_INSTALL_DIR}/lib -L${JANA_INSTALL_DIR}/lib -lJANA ${LDFLAGS} ${JANA_ONLY_LIBS} ${LIBS}"
;;
esac
case $1 in
--static-libs)
mess="$mess ${JANA_INSTALL_DIR}/lib/libJANA.a ${LDFLAGS} ${JANA_ONLY_LIBS} ${LIBS}"
;;
esac
case $1 in
Expand Down
2 changes: 1 addition & 1 deletion src/examples/SubeventCUDAExample/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ if (USE_CUDA)
target_link_libraries(SubeventCUDAExample jana2)
set_target_properties(SubeventCUDAExample PROPERTIES PREFIX "" OUTPUT_NAME "SubeventCUDAExample"
CUDA_ARCHITECTURES "75;80")
install(TARGETS SubeventCUDAExample DESTINATION programs)
install(TARGETS SubeventCUDAExample DESTINATION bin)
else()
message(STATUS "Skipping examples/SubeventCUDAExample because USE_CUDA=Off")

Expand Down
2 changes: 1 addition & 1 deletion src/examples/SubeventCUDAExample/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ This is an example that can run on a single GPU.
```
Launch the application.
```bash
bash-4.2$ ./install/programs/SubeventCUDAExample
bash-4.2$ ./install/bin/SubeventCUDAExample
```

2 changes: 1 addition & 1 deletion src/examples/UnitTestingExample/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ target_include_directories(UnitTestingExample PRIVATE ${CMAKE_SOURCE_DIR}/src/ex

target_link_libraries(UnitTestingExample Tutorial_plugin jana2)
set_target_properties(UnitTestingExample PROPERTIES PREFIX "" OUTPUT_NAME "UnitTestingExample")
install(TARGETS UnitTestingExample DESTINATION programs)
install(TARGETS UnitTestingExample DESTINATION bin)
Loading