Removing outdated CMake function calls that have not been doing anything in a

long time anyway. And were not removed from the AtlasCMake code for good.

Calorimeter/CaloGeoHelpers/CMakeLists.txt

@@ -11,8 +11,6 @@ atlas_depends_on_subdirs( PUBLIC
                           PRIVATE
                           AtlasTest/TestTools )
 
-athena_install_nonstandard_headers(CaloGeoHelpers/CaloSampling.def)
-
 # Component(s) in the package:
 atlas_add_library( CaloGeoHelpers
                    Root/*.cxx

Event/xAOD/xAODCaloRings/CMakeLists.txt

@@ -17,8 +17,6 @@ atlas_depends_on_subdirs( PUBLIC
 # External dependencies:
 find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
 
-athena_install_nonstandard_headers(xAODCaloRings/versions)
-
 # Component(s) in the package:
 atlas_add_library( xAODCaloRings
                    Root/*.cxx

InnerDetector/InDetConditions/PixelCoralClientUtils/CMakeLists.txt

@@ -14,8 +14,6 @@ find_package( COOL COMPONENTS CoolKernel )
 find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess )
 find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
 
-athena_install_nonstandard_headers(PixelCoralClientUtils/*.hh)
-
 # Component(s) in the package:
 atlas_add_library( PixelCoralClientUtils
                    src/CoralClient.cc

MuonSpectrometer/MuonCalib/MuonCalibUtils/MuonCalibMath/CMakeLists.txt

@@ -14,8 +14,6 @@ find_package( CLHEP )
 find_package( Eigen )
 find_package( ROOT COMPONENTS MathCore MathMore Core Tree Hist RIO pthread )
 
-athena_install_nonstandard_headers(MuonCalibMath/*.ixx)
-
 # Component(s) in the package:
 atlas_add_library( MuonCalibMath
                    src/*.cxx

PackDist/CMakeLists.txt

@@ -4,13 +4,3 @@
 
 # Declare the package name:
 atlas_subdir( PackDist )
-
-# this line failed automatic conversion in cmt2cmake :
-# set_remove PACKOPTS "-w"
-
-# this line failed automatic conversion in cmt2cmake :
-# set_append PACKOPTS " -w "
-
-athena_env( SET PACKCFG ../config/pack-nightly-bugfix.cfg
-            SET PACKOPTS \\\${PACKOPTS} )
-

Tools/CodeCheck/CMakeLists.txt

@@ -4,7 +4,3 @@
 
 # Declare the package name:
 atlas_subdir( CodeCheck )
-
-athena_env( SET atlas_checker_command \"\"
-            SET atlas_patch_command \"\" )
-

Tools/JobTransforms/CMakeLists.txt

@@ -7,7 +7,3 @@ atlas_subdir( JobTransforms )
 
 # External dependencies:
 find_package( PythonLibs )
-
-athena_env( SET T_INCPATH \\\${CMTINSTALLAREA}/share/JT/include
-            SET T_RELEASE \\\${JobTransforms_project_release} )
-

Tools/Scripts/CMakeLists.txt

@@ -9,8 +9,7 @@ atlas_subdir( Scripts )
 # setup_script $(SETUPCOMPLETIONROOT)/cmt/completion/setup_completion_main
 
 # Install files from the package:
-atlas_install_scripts( share/get_joboptions share/get_files share/lookup_local_joboptions.sh share/lookup_joboptions.sh share/lookup_scripts.sh share/lookup_xmls.sh share/lookup_data.sh share/checkDbgSymbols.sh )
-
-athena_env( SET DO_EXT_ATHENA_TAB_COMPLETION 0
-            SET SETUPCOMPLETIONROOT \\\${SCRIPTSROOT} )
-
+atlas_install_scripts( share/get_joboptions share/get_files
+   share/lookup_local_joboptions.sh share/lookup_joboptions.sh
+   share/lookup_scripts.sh share/lookup_xmls.sh share/lookup_data.sh
+   share/checkDbgSymbols.sh )

graphics/AtlantisJava/CMakeLists.txt

@@ -6,7 +6,7 @@
 atlas_subdir( AtlantisJava )
 
 # External dependencies:
-find_package( JavaSDK )
+find_package( Java )
 
 # Install files from the package:
 atlas_install_joboptions( share/InteractiveServer.py )
@@ -29,6 +29,3 @@ atlas_install_generic( geometry/*.xml
 atlas_install_generic( help/help.jar help/online.xml help/*.png
                        DESTINATION "share/AtlantisJava/help"
                        EXECUTABLE )
-
-athena_env( SET ANT_OPTS "-Xms64m -Xmx64m" )
-