fix library names

cmake/Modules/BuildLibrary.cmake

@@ -9,17 +9,17 @@ macro (clhep_build_library package )
   set ( package_library_list )
   if( ${PACKAGE}_DEPS )
      foreach ( dep ${${PACKAGE}_DEPS} )
-        message( STATUS "clhep_build_library ${package} will use ${dep}")
+        ##message( STATUS "clhep_build_library ${package} will use ${dep}")
 	list(APPEND package_library_list ${dep} )
      endforeach()
   endif()
   ADD_LIBRARY (${package}  SHARED ${libCLHEP_${package}_SOURCES})
   ADD_LIBRARY (${package}S STATIC ${libCLHEP_${package}_SOURCES})
   SET_TARGET_PROPERTIES (${package}
-      PROPERTIES OUTPUT_NAME CLHEP_${package}-${VERSION}
+      PROPERTIES OUTPUT_NAME CLHEP-${package}-${VERSION}
       )
   SET_TARGET_PROPERTIES (${package}S
-      PROPERTIES OUTPUT_NAME CLHEP_${package}-${VERSION}
+      PROPERTIES OUTPUT_NAME CLHEP-${package}-${VERSION}
       )
   SET_TARGET_PROPERTIES(${package}  PROPERTIES CLEAN_DIRECT_OUTPUT 1)
   SET_TARGET_PROPERTIES(${package}S PROPERTIES CLEAN_DIRECT_OUTPUT 1)

cmake/Modules/BuildTest.cmake

@@ -15,12 +15,12 @@ macro( clhep_test testname )
   if( CTST_NOLIB )
     set ( package_library_list )
   else()
-    set ( package_library_list ${PROJECT_BINARY_DIR}/lib/libCLHEP_${PACKAGE}-${VERSION}.a )
+    set ( package_library_list ${PROJECT_BINARY_DIR}/lib/libCLHEP-${PACKAGE}-${VERSION}.a )
   endif()
   if( ${PACKAGE}_DEPS )
      foreach ( dep ${${PACKAGE}_DEPS} )
-        message( STATUS "clhep_test ${testname} will use ${dep}")
-	list(APPEND package_library_list  ${PROJECT_BINARY_DIR}/lib/libCLHEP_${dep}-${VERSION}.a )
+        ##message( STATUS "clhep_test ${testname} will use ${dep}")
+	list(APPEND package_library_list  ${PROJECT_BINARY_DIR}/lib/libCLHEP-${dep}-${VERSION}.a )
      endforeach()
   endif()
   link_libraries( ${package_library_list} )