diff --git a/.gitignore b/.gitignore index e7ce99f16..417a9359b 100644 --- a/.gitignore +++ b/.gitignore @@ -49,6 +49,10 @@ Makefile build/ cmake-build-debug/ install/ +bin/ +include/ +lib/ +programs/ # Doxygen generated files docs/html/* diff --git a/cmake/MakeConfig.cmake b/cmake/MakeConfig.cmake index 41eb17ccc..b28ac9a4f 100644 --- a/cmake/MakeConfig.cmake +++ b/cmake/MakeConfig.cmake @@ -141,11 +141,11 @@ endif() set(HAVE_NUMA 0) configure_file(scripts/jana-config.in jana-config @ONLY) -configure_file(scripts/jana_config.h.in jana_config.h @ONLY) +configure_file(scripts/jana_config.h.in src/libraries/JANA/jana_config.h @ONLY) configure_file(scripts/jana-this.sh.in jana-this.sh @ONLY) configure_file(scripts/jana-this.csh.in jana-this.csh @ONLY) install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/jana-config DESTINATION bin) -install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/jana_config.h DESTINATION include/JANA) +install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/src/libraries/JANA/jana_config.h DESTINATION include/JANA) install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/jana-this.sh DESTINATION bin) install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/jana-this.csh DESTINATION bin) diff --git a/src/libraries/JANA/Compatibility/JGeometryXML.h b/src/libraries/JANA/Compatibility/JGeometryXML.h index 81f758dca..ecaff5d17 100644 --- a/src/libraries/JANA/Compatibility/JGeometryXML.h +++ b/src/libraries/JANA/Compatibility/JGeometryXML.h @@ -14,7 +14,7 @@ #include #include #include -//#include +#include #include