Merge branch 'issue_60_fixing_install' into 'master'

fixing cmake build

Closes #60

See merge request AirShowerPhysics/corsika!16

CMakeLists.txt

@@ -15,7 +15,7 @@ set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMakeModules)
 include (CorsikaUtilities) # a few cmake function
 
 # enable warnings and disallow non-standard language
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pedantic -Wextra")
+add_definitions(-Wall -pedantic -Wextra)
 
 set (CMAKE_CXX_STANDARD 17)
 enable_testing ()
@@ -31,16 +31,16 @@ set (CTEST_OUTPUT_ON_FAILURE 1)
 #  #-j ${PROCESSOR_COUNT}
 #  #     DEPENDENCIES corsika
 #  )
-   
+
 #add_custom_target (corsika_pre_build)
 #add_custom_command (TARGET corsika_pre_build PRE_BUILD COMMAND "${PROJECT_SOURCE_DIR}/pre_compile.py")
 
 # dependencies
-#find_package (Boost 1.40 COMPONENTS program_options REQUIRED)
+find_package (Boost 1.60 REQUIRED)
 find_package (Eigen3 REQUIRED)
 #find_package (HDF5) # not yet needed
 
-# order of subdirectories 
+# order of subdirectories
 add_subdirectory (ThirdParty)
 #add_subdirectory (Utilities)
 add_subdirectory (Framework)

Documentation/Doxygen/CMakeLists.txt

 
-find_package (Doxygen REQUIRED dot OPTIONAL_COMPONENTS mscgen dia)
+find_package (Doxygen OPTIONAL_COMPONENTS dot mscgen dia)
 
 if (DOXYGEN_FOUND)
+  if (NOT DOXYGEN_DOT_EXECUTABLE)
+    message (FATAL_ERROR "Found doxygen but not 'dot' command, please install graphviz or set DOXYGEN_DOT_EXECUTABLE")
+  endif()
+
   set (DOXYGEN_IN ${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in)
   set (DOXYGEN_OUT ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile)
   set (DOXYGEN_GENERATE_HTML YES)
@@ -28,4 +32,3 @@ else (DOXYGEN_FOUND)
   message ("Doxygen need to be installed to generate the doxygen documentation")
   
 endif (DOXYGEN_FOUND)
-

README.md

@@ -22,9 +22,9 @@ We also want to point you to the [MCnet guidelines](https://gitlab.ikp.kit.edu/A
 
 ## Installation
 
-Prerequisites: eigen3, cmake, g++, git. On Ubuntu 18.04, just do:
+Prerequisites: eigen3, boost, cmake, g++, git. On Ubuntu 18.04, just do:
 ```
-sudo apt-get install libeigen3-dev cmake g++ git
+sudo apt-get install libeigen3-dev libboost-dev cmake g++ git
 ```
 
 Follow these steps to download and install CORSIKA8-milestone1
@@ -40,3 +40,14 @@ make install
 make test
 ```
 and if you want to see how the Heitler model works and is implemented, see `Framework/Cascade/testCascade.cc` for a starting point. 
+
+### Generating doxygen documentation
+
+To generate the documentation, you need doxygen and graphviz. On Ubuntu 18.04, do:
+```
+sudo apt-get install doxygen graphviz
+```
+Switch to the corsika build directory and do
+```
+make doxygen
+```