Merge pull request #72 from JETSCAPE/roch/cmake_ipglasma_flag

CMake IP-Glasma flag

Author: ritobandatta

CMakeLists.txt

@@ -67,7 +67,7 @@ if (OPENCL_FOUND)
   endif (USE_CLVISC)
 endif (OPENCL_FOUND)
 
-# IPGlasma. Turn on with 'cmake -DUSE_IPGLASMA=ON'.
+# IP-Glasma. Turn on with 'cmake -DUSE_IPGLASMA=ON'.
 option(USE_IPGLASMA "Build with IP-Glasma" OFF)
 if (USE_IPGLASMA)
     message("Includes for IP-Glasma ...")
@@ -402,17 +402,17 @@ if (USE_3DGlauber)
 endif()
 
 
-if (USE_IPGlasma)
+if (USE_IPGLASMA)
   if(NOT EXISTS "${CMAKE_SOURCE_DIR}/external_packages/ipglasma")
-      message(FATAL_ERROR "Error: IPGlasma source has not been downloaded in external_packages by ./get_ipglasma.sh")
+      message(FATAL_ERROR "Error: IP-Glasma source has not been downloaded in external_packages by ./get_ipglasma.sh")
   endif()
   if (${GSL_FOUND})
-    message("Building IPGlasma ...")
+    message("Building IP-Glasma ...")
     add_subdirectory(./external_packages/ipglasma)
   else()
-    message (FATAL_ERROR "GSL are necessary for ipglasma" )
+    message (FATAL_ERROR "GSL is necessary for IP-Glasma" )
   endif()
-  target_compile_definitions(JetScape PRIVATE USE_IPGlasma)
+  target_compile_definitions(JetScape PRIVATE USE_IPGLASMA)
 endif()
 
 if (USE_MUSIC)
@@ -515,9 +515,9 @@ endif (USE_SMASH )
 
 
 # executables with additional dependencies
-if ( USE_IPGlasma )
+if ( USE_IPGLASMA )
     target_link_libraries(runJetscape ${GSL_LIBRARIES})
-endif (USE_IPGlasma )
+endif (USE_IPGLASMA )
 if ( USE_MUSIC AND USE_ISS )
     target_link_libraries(runJetscape ${GSL_LIBRARIES})
 endif (USE_MUSIC AND USE_ISS )
@@ -539,12 +539,12 @@ endif(USE_ROOT)
 # -----------------------------------------------------------
 #### copy essential files for MUSIC to build/
 file(COPY ./external_packages/trento/nucleusConfigs DESTINATION ${CMAKE_BINARY_DIR}/)
-if (USE_IPGlasma)
+if (USE_IPGLASMA)
   if(EXISTS "${CMAKE_SOURCE_DIR}/external_packages/ipglasma/")
     file(COPY ${CMAKE_SOURCE_DIR}/examples/test_ipglasma_files/ipglasma.input DESTINATION ${CMAKE_BINARY_DIR}/)
     file(COPY ${CMAKE_SOURCE_DIR}/external_packages/ipglasma/qs2Adj_vs_Tp_vs_Y_200.in DESTINATION ${CMAKE_BINARY_DIR}/)
   else()
-    message(FATAL_ERROR "Error: Cannot find files for IPGlasma.")
+    message(FATAL_ERROR "Error: Cannot find files for IP-Glasma.")
   endif()
 endif()
 if (USE_FREESTREAM)

src/CMakeLists.txt

@@ -37,7 +37,7 @@ endif()
 FILE(GLOB initialstatesources initialstate/*.cc)
 set (SOURCES  ${SOURCES}  ${initialstatesources} )
 ## Take care of options
-if(NOT "${USE_IPGlasma}")
+if(NOT "${USE_IPGLASMA}")
   list (REMOVE_ITEM SOURCES ${CMAKE_SOURCE_DIR}/src/initialstate/IPGlasmaWrapper.cc)
 endif()
 
@@ -135,7 +135,7 @@ if ( ${HEPMC_FOUND} )
   endif()
 endif()
 
-if ( USE_IPGlasma)
+if ( USE_IPGLASMA )
   target_link_libraries (JetScape ipglasma_lib)
 endif()