suppressed ROOT warnings while building
authorjjose <jjose@f7af4fe6-9843-0410-8265-dc069ae4e863>
Tue, 24 Aug 2010 16:28:24 +0000 (16:28 +0000)
committerjjose <jjose@f7af4fe6-9843-0410-8265-dc069ae4e863>
Tue, 24 Aug 2010 16:28:24 +0000 (16:28 +0000)
CMakeLists.txt
cmake/modules/CreateSubCMakeFiles.cmake

index 4b852bd..38c95f7 100644 (file)
@@ -26,6 +26,7 @@ message("ALICE_ROOT: ${ALICE_ROOT}")
 set(CMAKE_VERBOSE_MAKEFILE ON)
 
 # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ 
+set(PROJECT_BINARY_DIR ${ALICE_INSTALL})
 set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin/tgt_${ALICE_TARGET})
 set(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib/tgt_${ALICE_TARGET})
 set(CMAKE_MODULE_PATH "${ALICE_ROOT}/cmake/modules")
@@ -207,9 +208,9 @@ Add_subdirectory(ALIROOT)
 add_subdirectory(test)
 add_test ("Aliroot_executable" aliroot -q) 
 #copy testing files
-if(EXISTS "${CTEST_SOURCE_DIRECTORY}/CTestCustom.cmake")
-configure_file("CTestCustom.cmake" "${CTEST_BINARY_DIRECTORY}" COPYONLY)
-endif(EXISTS "${CTEST_SOURCE_DIRECTORY}/CTestCustom.cmake")
+if(EXISTS "${PROJECT_SOURCE_DIRECTORY}/CTestCustom.cmake")
+configure_file("CTestCustom.cmake" "${PROJECT_BINARY_DIRECTORY}" COPYONLY)
+endif(EXISTS "${PROJECT_SOURCE_DIRECTORY}/CTestCustom.cmake")
 execute_process(COMMAND "cmake" "-E" "copy_directory" "${ALICE_ROOT}/test" "${ALICE_INSTALL}/test")
 
 message("Note : In order for the warnings test to execute successfully you need to log your make build output to make.log in the ALICE_INSTALL Directory using this command \n make -k > make.log 2>&1")
index dcc18b5..5cd1cf2 100644 (file)
@@ -465,8 +465,6 @@ Macro(CreateMainCMakeFile path)
       file(APPEND ${FileName} "\${CMAKE_SOURCE_DIR}/${file}\n")
     EndIf(file MATCHES "^.*[$].*$")
   endforeach(file ${EINCLUDE_SUBDIR})
-  file(APPEND ${FileName} "\${ROOT_INCLUDE_DIR}\n")
-
   if(${_dir} STREQUAL STEER OR ${_dir} STREQUAL TPC OR ${_dir} STREQUAL ALIROOT) 
     file(APPEND ${FileName} "\${CMAKE_BINARY_DIR}/STEER\n")
   endif(${_dir} STREQUAL STEER OR ${_dir} STREQUAL TPC OR ${_dir} STREQUAL ALIROOT) 
@@ -477,6 +475,7 @@ Macro(CreateMainCMakeFile path)
 
   file(APPEND ${FileName} ")\n\n")
   file(APPEND ${FileName} "include_directories(\${INCLUDE_DIRECTORIES})\n\n")
+  file(APPEND ${FileName} "include_directories( SYSTEM \${ROOT_INCLUDE_DIR})\n\n")
   file(APPEND ${FileName} "set(LINK_DIRECTORIES\n")
   file(APPEND ${FileName} "\${ROOT_LIBRARY_DIR}\n")
   file(APPEND ${FileName} ")\n\n")
@@ -660,4 +659,4 @@ Macro(SpecialSettingsMadeByHand lib)
 #    STRING(REGEX REPLACE "[=]" "\\\\=" PACKCXXFLAGS "${PACKCXXFLAGS}")
 #      STRING(REGEX REPLACE "[$][(]ALICE_ROOT[)]" "\$ENV{ALICE_ROOT}" PACKCXXFLAGS "${PACKCXXFLAGS}")    
   EndIf(${lib} STREQUAL liblhapdf)
-EndMacro(SpecialSettingsMadeByHand lib)
\ No newline at end of file
+EndMacro(SpecialSettingsMadeByHand lib)